diff --git a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php @@ -82,7 +82,7 @@ 'authorPHID' => $revision->getAuthorPHID(), 'uri' => PhabricatorEnv::getURI('/D'.$revision->getID()), 'title' => $revision->getTitle(), - 'status' => $revision->getStatus(), + 'status' => $revision->getLegacyRevisionStatus(), 'statusName' => $revision->getStatusDisplayName(), 'summary' => $revision->getSummary(), 'testPlan' => $revision->getTestPlan(), diff --git a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php @@ -218,7 +218,7 @@ 'dateCreated' => $revision->getDateCreated(), 'dateModified' => $revision->getDateModified(), 'authorPHID' => $revision->getAuthorPHID(), - 'status' => $revision->getStatus(), + 'status' => $revision->getLegacyRevisionStatus(), 'statusName' => $revision->getStatusDisplayName(), 'properties' => $revision->getProperties(), 'branch' => $diff->getBranch(), diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -535,9 +535,9 @@ return $xactions; } - $old_legacy_status = $revision->getStatus(); + $old_legacy_status = $revision->getLegacyRevisionStatus(); $revision->setModernRevisionStatus($new_status); - $new_legacy_status = $revision->getStatus(); + $new_legacy_status = $revision->getLegacyRevisionStatus(); if ($new_legacy_status == $old_legacy_status) { return $xactions; } diff --git a/src/applications/differential/phid/DifferentialRevisionPHIDType.php b/src/applications/differential/phid/DifferentialRevisionPHIDType.php --- a/src/applications/differential/phid/DifferentialRevisionPHIDType.php +++ b/src/applications/differential/phid/DifferentialRevisionPHIDType.php @@ -33,7 +33,6 @@ $revision = $objects[$phid]; $title = $revision->getTitle(); - $status = $revision->getStatus(); $monogram = $revision->getMonogram(); $uri = $revision->getURI(); @@ -46,10 +45,8 @@ $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED); } - $status = $revision->getStatus(); - - $icon = $revision->getStatusIcon($status); - $color = $revision->getStatusIconColor($status); + $icon = $revision->getStatusIcon(); + $color = $revision->getStatusIconColor(); $name = $revision->getStatusDisplayName(); $handle diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php --- a/src/applications/differential/storage/DifferentialRevision.php +++ b/src/applications/differential/storage/DifferentialRevision.php @@ -631,6 +631,10 @@ return $this->getStatusObject()->getKey(); } + public function getLegacyRevisionStatus() { + return $this->getStatus(); + } + public function isClosed() { return $this->getStatusObject()->isClosedStatus(); } diff --git a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php --- a/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionStatusTransaction.php @@ -6,11 +6,11 @@ const TRANSACTIONTYPE = 'differential.revision.status'; public function generateOldValue($object) { - return $object->getStatus(); + return $object->getLegacyRevisionStatus(); } public function applyInternalEffects($object, $value) { - $object->setStatus($value); + $object->setLegacyRevisionStatus($value); } public function getTitle() {