diff --git a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php index f7bbe40d5f..f59aff2767 100644 --- a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php +++ b/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php @@ -29,7 +29,12 @@ final class ConduitAPI_differential_close_Method protected function execute(ConduitAPIRequest $request) { $id = $request->getValue('revisionID'); - $revision = id(new DifferentialRevision())->load($id); + $revision = id(new DifferentialRevisionQuery()) + ->withIDs(array($id)) + ->setViewer($request->getUser()) + ->needRelationships(true) + ->needReviewerStatus(true) + ->executeOne(); if (!$revision) { throw new ConduitException('ERR_NOT_FOUND'); } @@ -43,8 +48,6 @@ final class ConduitAPI_differential_close_Method return; } - $revision->loadRelationships(); - $content_source = PhabricatorContentSource::newForSource( PhabricatorContentSource::SOURCE_CONDUIT, array()); diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php index 7bd90f6ca7..c8d000f713 100644 --- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php +++ b/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php @@ -32,15 +32,21 @@ final class ConduitAPI_differential_getcommitmessage_Method $id = $request->getValue('revision_id'); if ($id) { - $revision = id(new DifferentialRevision())->load($id); + $revision = id(new DifferentialRevisionQuery()) + ->withIDs(array($id)) + ->setViewer($request->getUser()) + ->needRelationships(true) + ->needReviewerStatus(true) + ->executeOne(); + if (!$revision) { throw new ConduitException('ERR_NOT_FOUND'); } } else { $revision = new DifferentialRevision(); + $revision->attachRelationships(array()); } - $revision->loadRelationships(); $is_edit = $request->getValue('edit'); $is_create = ($is_edit == 'create'); diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php index e2ce4aeac4..ef4669aa3b 100644 --- a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php +++ b/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php @@ -38,12 +38,17 @@ final class ConduitAPI_differential_getrevision_Method $diff = null; $revision_id = $request->getValue('revision_id'); - $revision = id(new DifferentialRevision())->load($revision_id); + $revision = id(new DifferentialRevisionQuery()) + ->withIDs(array($revision_id)) + ->setViewer($request->getUser()) + ->needRelationships(true) + ->needReviewerStatus(true) + ->executeOne(); + if (!$revision) { throw new ConduitException('ERR_BAD_REVISION'); } - $revision->loadRelationships(); $reviewer_phids = array_values($revision->getReviewers()); $diffs = $revision->loadDiffs(); diff --git a/src/applications/differential/conduit/ConduitAPI_differential_markcommitted_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_markcommitted_Method.php index e0328b66a6..7bba22c24f 100644 --- a/src/applications/differential/conduit/ConduitAPI_differential_markcommitted_Method.php +++ b/src/applications/differential/conduit/ConduitAPI_differential_markcommitted_Method.php @@ -38,7 +38,12 @@ final class ConduitAPI_differential_markcommitted_Method protected function execute(ConduitAPIRequest $request) { $id = $request->getValue('revision_id'); - $revision = id(new DifferentialRevision())->load($id); + $revision = id(new DifferentialRevisionQuery()) + ->withIDs(array($id)) + ->setViewer($request->getUser()) + ->needRelationships(true) + ->needReviewerStatus(true) + ->executeOne(); if (!$revision) { throw new ConduitException('ERR_NOT_FOUND'); } @@ -47,8 +52,6 @@ final class ConduitAPI_differential_markcommitted_Method return; } - $revision->loadRelationships(); - $editor = new DifferentialCommentEditor( $revision, DifferentialAction::ACTION_CLOSE);