diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php --- a/src/applications/audit/editor/PhabricatorAuditEditor.php +++ b/src/applications/audit/editor/PhabricatorAuditEditor.php @@ -232,14 +232,22 @@ PhabricatorLiskDAO $object, PhabricatorApplicationTransaction $xaction) { + $auditors_type = DiffusionCommitAuditorsTransaction::TRANSACTIONTYPE; + $xactions = parent::expandTransaction($object, $xaction); + switch ($xaction->getTransactionType()) { case PhabricatorAuditTransaction::TYPE_COMMIT: - $request = $this->createAuditRequestTransactionFromCommitMessage( + $phids = $this->getAuditRequestTransactionPHIDsFromCommitMessage( $object); - if ($request) { - $xactions[] = $request; - $this->addUnmentionablePHIDs($request->getNewValue()); + if ($phids) { + $xactions[] = $object->getApplicationTransactionTemplate() + ->setTransactionType($auditors_type) + ->setNewValue( + array( + '+' => array_fuse($phids), + )); + $this->addUnmentionablePHIDs($phids); } break; default: @@ -268,7 +276,7 @@ return $xactions; } - private function createAuditRequestTransactionFromCommitMessage( + private function getAuditRequestTransactionPHIDsFromCommitMessage( PhabricatorRepositoryCommit $commit) { $actor = $this->getActor(); @@ -297,12 +305,7 @@ return array(); } - return $commit->getApplicationTransactionTemplate() - ->setTransactionType(DiffusionCommitAuditorsTransaction::TRANSACTIONTYPE) - ->setNewValue( - array( - '+' => array_fuse($phids), - )); + return $phids; } protected function sortTransactions(array $xactions) {