From 29bdc3ffc5a496e7013188cc30b87cd78b846212 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 11 Oct 2012 14:34:16 -0700 Subject: [PATCH] Fix DifferentialRevisionEditor handling of actorPHID after D3645 Summary: `actorPHID` no longer gets set or exists. Test Plan: Updated a revision without fataling. Reviewers: btrahan, vrana Reviewed By: vrana CC: aran Differential Revision: https://secure.phabricator.com/D3684 --- .../differential/editor/DifferentialRevisionEditor.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/applications/differential/editor/DifferentialRevisionEditor.php b/src/applications/differential/editor/DifferentialRevisionEditor.php index 5436d99fff..3eeafb2ca9 100644 --- a/src/applications/differential/editor/DifferentialRevisionEditor.php +++ b/src/applications/differential/editor/DifferentialRevisionEditor.php @@ -142,7 +142,7 @@ final class DifferentialRevisionEditor extends PhabricatorEditor { } protected function getActorPHID() { - return $this->actorPHID; + return $this->getActor()->getPHID(); } public function isNewRevision() { @@ -293,7 +293,7 @@ final class DifferentialRevisionEditor extends PhabricatorEditor { $this->reviewers, array_keys($rem['rev']), array_keys($add['rev']), - $this->actorPHID); + $this->getActorPHID()); // We want to attribute new CCs to a "reasonPHID", representing the reason // they were added. This is either a user (if some user explicitly CCs @@ -306,18 +306,18 @@ final class DifferentialRevisionEditor extends PhabricatorEditor { if (empty($new['ccs'][$phid])) { $reasons[$phid] = $xscript_phid; } else { - $reasons[$phid] = $this->actorPHID; + $reasons[$phid] = $this->getActorPHID(); } } foreach ($rem['ccs'] as $phid => $ignored) { if (empty($new['ccs'][$phid])) { - $reasons[$phid] = $this->actorPHID; + $reasons[$phid] = $this->getActorPHID(); } else { $reasons[$phid] = $xscript_phid; } } } else { - $reasons = $this->actorPHID; + $reasons = $this->getActorPHID(); } self::alterCCs(