Set viewer for all handles loaded in controllers

Summary:
I've replaced all `id(new PhabricatorObjectHandleData(...))->loadHandles()` by `$this->loadViewerHandles(...)`.
Lint caught one usage in a static method.

Test Plan: Displayed revision with sporadic author.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3432

src/applications/audit/controller/PhabricatorAuditAddCommentController.php

@@ -54,7 +54,7 @@ final class PhabricatorAuditAddCommentController
       ->addCCs($ccs)
       ->addComment($comment);
 
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $uri = $handles[$commit_phid]->getURI();
 
     $draft = id(new PhabricatorDraft())->loadOneWhere(

src/applications/audit/controller/PhabricatorAuditListController.php

@@ -228,7 +228,7 @@ final class PhabricatorAuditListController extends PhabricatorAuditController {
     }
 
     $phids = array($phid);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $handle = $handles[$phid];
 
     $this->validateHandle($handle);
@@ -393,7 +393,7 @@ final class PhabricatorAuditListController extends PhabricatorAuditController {
     $view->setNoDataString($nodata);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();
@@ -485,7 +485,7 @@ final class PhabricatorAuditListController extends PhabricatorAuditController {
     $view->setNoDataString($nodata);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();

src/applications/audit/controller/PhabricatorAuditPreviewController.php

@@ -68,7 +68,7 @@ final class PhabricatorAuditPreviewController
 
     $phids = array_merge($phids, $view->getRequiredHandlePHIDs());
 
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     id(new PhabricatorDraft())

src/applications/base/controller/PhabricatorController.php

@@ -217,10 +217,14 @@ abstract class PhabricatorController extends AphrontController {
 
   protected function loadHandles(array $phids) {
     $phids = array_filter($phids);
-    $this->handles = id(new PhabricatorObjectHandleData($phids))
+    $this->handles = $this->loadViewerHandles($phids);
+    return $this;
+  }
+
+  protected function loadViewerHandles(array $phids) {
+    return id(new PhabricatorObjectHandleData($phids))
       ->setViewer($this->getRequest()->getUser())
       ->loadHandles();
-    return $this;
   }
 
   protected function renderHandlesForPHIDs(array $phids) {

src/applications/calendar/controller/PhabricatorCalendarBrowseController.php

@@ -43,7 +43,7 @@ final class PhabricatorCalendarBrowseController
     $month_view->setHolidays($holidays);
 
     $phids = mpull($statuses, 'getUserPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     foreach ($statuses as $status) {
       $event = new AphrontCalendarEventView();

src/applications/countdown/controller/PhabricatorCountdownListController.php

@@ -36,7 +36,7 @@ final class PhabricatorCountdownListController
     $timers = $pager->sliceResults($timers);
 
     $phids = mpull($timers, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($timers as $timer) {

src/applications/differential/controller/DifferentialChangesetViewController.php

@@ -203,8 +203,7 @@ final class DifferentialChangesetViewController extends DifferentialController {
     }
     $phids = array_keys($phids);
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
     $parser->setHandles($handles);
 
     $engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();

src/applications/differential/controller/DifferentialCommentPreviewController.php

@@ -59,9 +59,7 @@ final class DifferentialCommentPreviewController
       $handles = array_merge($handles, $ccs);
     }
 
-    $handles = id(new PhabricatorObjectHandleData($handles))
+    $handles = $this->loadViewerHandles($handles);
-      ->setViewer($request->getUser())
-      ->loadHandles();
 
     $view = new DifferentialRevisionCommentView();
     $view->setUser($request->getUser());

src/applications/differential/controller/DifferentialRevisionEditController.php

@@ -92,8 +92,7 @@ final class DifferentialRevisionEditController extends DifferentialController {
     }
     $phids = array_mergev($aux_phids);
     $phids = array_unique($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
     foreach ($aux_fields as $key => $aux_field) {
       $aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
     }

src/applications/differential/controller/DifferentialRevisionListController.php

@@ -172,9 +172,7 @@ final class DifferentialRevisionListController extends DifferentialController {
       }
       $phids = array_mergev(mpull($view_objects, 'getRequiredHandlePHIDs'));
       $phids[] = $params['phid'];
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->setViewer($this->getRequest()->getUser())
-        ->loadHandles();
 
       foreach ($views as $view) {
         if (empty($view['special'])) {

src/applications/differential/controller/DifferentialRevisionStatsController.php

@@ -125,8 +125,7 @@ final class DifferentialRevisionStatsController extends DifferentialController {
                               DifferentialAction::ACTION_CLOSE);
 
     $panels = array();
-    $handles = id(new PhabricatorObjectHandleData(array($params['phid'])))
+    $handles = $this->loadViewerHandles(array($params['phid']));
-                  ->loadHandles();
 
     $filter_form = id(new AphrontFormView())
       ->setAction('/differential/stats/'.$this->filter.'/')

src/applications/differential/controller/DifferentialRevisionViewController.php

@@ -144,9 +144,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
     $object_phids = array_merge($object_phids, array_mergev($aux_phids));
     $object_phids = array_unique($object_phids);
 
-    $handles = id(new PhabricatorObjectHandleData($object_phids))
+    $handles = $this->loadViewerHandles($object_phids);
-      ->setViewer($this->getRequest()->getUser())
-      ->loadHandles();
 
     foreach ($aux_fields as $key => $aux_field) {
       // Make sure each field only has access to handles it specifically
@@ -883,9 +881,7 @@ final class DifferentialRevisionViewController extends DifferentialController {
       ->loadAssets();
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->setViewer($this->getRequest()->getUser())
-      ->loadHandles();
     $view->setHandles($handles);
 
     return

src/applications/diffusion/controller/DiffusionBrowseController.php

@@ -79,7 +79,7 @@ final class DiffusionBrowseController extends DiffusionController {
       }
 
       $phids = array_keys($phids);
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
 
       $browse_table = new DiffusionBrowseTableView();
       $browse_table->setDiffusionRequest($drequest);

src/applications/diffusion/controller/DiffusionCommitController.php

@@ -361,8 +361,7 @@ final class DiffusionCommitController extends DiffusionController {
 
     $handles = array();
     if ($phids) {
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->loadHandles();
     }
 
     $props = array();
@@ -469,7 +468,7 @@ final class DiffusionCommitController extends DiffusionController {
     $view->setShowDescriptions(false);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
     $view->setAuthorityPHIDs($this->auditAuthorityPHIDs);
     $this->highlightedAudits = $view->getHighlightedAudits();
@@ -509,7 +508,7 @@ final class DiffusionCommitController extends DiffusionController {
     $view->setPathMap($path_map);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     return $view;
@@ -757,7 +756,7 @@ final class DiffusionCommitController extends DiffusionController {
     $history_table->loadRevisions();
 
     $phids = $history_table->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $history_table->setHandles($handles);
 
     $panel = new AphrontPanelView();

src/applications/diffusion/controller/DiffusionCommitEditController.php

@@ -42,8 +42,7 @@ final class DiffusionCommitEditController extends DiffusionController {
       $commit_phid,
       $edge_type
     );
-    $handles = id(new PhabricatorObjectHandleData($current_proj_phids))
+    $handles = $this->loadViewerHandles($current_proj_phids);
-      ->loadHandles();
     $proj_t_values = mpull($handles, 'getFullName', 'getPHID');
 
     if ($request->isFormPost()) {

src/applications/diffusion/controller/DiffusionController.php

@@ -141,7 +141,7 @@ abstract class DiffusionController extends PhabricatorController {
       ->loadAssets();
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();

src/applications/diffusion/controller/DiffusionDiffController.php

@@ -94,7 +94,7 @@ final class DiffusionDiffController extends DiffusionController {
       }
 
       $phids = mpull($inlines, 'getAuthorPHID');
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
       $parser->setHandles($handles);
     }
 

src/applications/diffusion/controller/DiffusionHistoryController.php

@@ -84,7 +84,7 @@ final class DiffusionHistoryController extends DiffusionController {
     $history_table->loadRevisions();
 
     $phids = $history_table->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $history_table->setHandles($handles);
 
     if ($show_graph) {

src/applications/diffusion/controller/DiffusionLastModifiedController.php

@@ -37,7 +37,7 @@ final class DiffusionLastModifiedController extends DiffusionController {
     }
 
     $phids = array_keys($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $output = DiffusionBrowseTableView::renderLastModifiedColumns(
       $drequest->getRepository(),

src/applications/diffusion/controller/DiffusionRepositoryController.php

@@ -64,7 +64,7 @@ final class DiffusionRepositoryController extends DiffusionController {
     }
 
     $phids = array_keys($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $history_table = new DiffusionHistoryTableView();
     $history_table->setDiffusionRequest($drequest);
@@ -240,7 +240,7 @@ final class DiffusionRepositoryController extends DiffusionController {
     $view->setCommits($commits);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();

src/applications/diffusion/controller/DiffusionTagListController.php

@@ -72,7 +72,7 @@ final class DiffusionTagListController extends DiffusionController {
         ->setDiffusionRequest($drequest);
 
       $phids = $view->getRequiredHandlePHIDs();
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
       $view->setHandles($handles);
 
       $panel = id(new AphrontPanelView())

src/applications/directory/controller/PhabricatorDirectoryMainController.php

@@ -332,7 +332,7 @@ final class PhabricatorDirectoryMainController
     $phids = array_merge(
       array($user_phid),
       $revision_view->getRequiredHandlePHIDs());
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $revision_view->setHandles($handles);
 
@@ -385,7 +385,7 @@ final class PhabricatorDirectoryMainController
       array_filter(mpull($tasks, 'getOwnerPHID')),
       array_mergev(mpull($tasks, 'getProjectPHIDs')));
 
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $view = new ManiphestTaskListView();
     $view->setTasks($tasks);
@@ -623,7 +623,7 @@ final class PhabricatorDirectoryMainController
     $view->setUser($user);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();
@@ -667,7 +667,7 @@ final class PhabricatorDirectoryMainController
     $view->setUser($user);
 
     $phids = $view->getRequiredHandlePHIDs();
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $view->setHandles($handles);
 
     $panel = new AphrontPanelView();

src/applications/drydock/controller/DrydockLeaseListController.php

@@ -34,7 +34,7 @@ final class DrydockLeaseListController extends DrydockController {
     $data = $pager->sliceResults($data);
 
     $phids = mpull($data, 'getOwnerPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $resource_ids = mpull($data, 'getResourceID');
     $resources = array();

src/applications/drydock/controller/DrydockResourceListController.php

@@ -34,7 +34,7 @@ final class DrydockResourceListController extends DrydockController {
     $data = $pager->sliceResults($data);
 
     $phids = mpull($data, 'getOwnerPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($data as $resource) {

src/applications/files/controller/PhabricatorFileListController.php

@@ -209,7 +209,7 @@ final class PhabricatorFileListController extends PhabricatorFileController {
     $this->setListPager($pager);
 
     $phids = mpull($files, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $highlighted = $request->getStr('h');
     $highlighted = explode('-', $highlighted);

src/applications/files/controller/PhabricatorFileMacroListController.php

@@ -57,8 +57,7 @@ final class PhabricatorFileMacroListController
         "phid IN (%Ls)",
         $file_phids);
       $author_phids = mpull($files, 'getAuthorPHID', 'getPHID');
-      $handles = id(new PhabricatorObjectHandleData($author_phids))
+      $handles = $this->loadViewerHandles($author_phids);
-        ->loadHandles();
     }
     $files_map = mpull($files, null, 'getPHID');
 

src/applications/herald/controller/HeraldHomeController.php

@@ -96,8 +96,7 @@ final class HeraldHomeController extends HeraldController {
     $rules = $query->executeWithOffsetPager($pager);
 
     $need_phids = mpull($rules, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($need_phids))
+    $handles = $this->loadViewerHandles($need_phids);
-      ->loadHandles();
 
     $list_view = id(new HeraldRuleListView())
       ->setRules($rules)

src/applications/herald/controller/HeraldRuleController.php

@@ -474,7 +474,7 @@ final class HeraldRuleController extends HeraldController {
 
     $phids[] = $rule->getAuthorPHID();
 
-    return id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    return $this->loadViewerHandles($phids);
   }
 
 

src/applications/herald/controller/HeraldRuleEditHistoryController.php

@@ -39,8 +39,7 @@ final class HeraldRuleEditHistoryController extends HeraldController {
     $edits = $edit_query->executeWithOffsetPager($pager);
 
     $need_phids = mpull($edits, 'getEditorPHID');
-    $handles = id(new PhabricatorObjectHandleData($need_phids))
+    $handles = $this->loadViewerHandles($need_phids);
-      ->loadHandles();
 
     $list_view = id(new HeraldRuleEditHistoryView())
       ->setEdits($edits)

src/applications/herald/controller/HeraldTranscriptController.php

@@ -61,8 +61,7 @@ final class HeraldTranscriptController extends HeraldController {
       $phids = array_unique($phids);
       $phids = array_filter($phids);
 
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->loadHandles();
       $this->handles = $handles;
 
       if ($xscript->getDryRun()) {
@@ -473,8 +472,7 @@ final class HeraldTranscriptController extends HeraldController {
     $data = array();
     if ($object_xscript) {
       $phid = $object_xscript->getPHID();
-      $handles = id(new PhabricatorObjectHandleData(array($phid)))
+      $handles = $this->loadViewerHandles(array($phid));
-        ->loadHandles();
 
       $data += array(
         'Object Name' => $object_xscript->getName(),

src/applications/herald/controller/HeraldTranscriptListController.php

@@ -63,8 +63,7 @@ final class HeraldTranscriptListController extends HeraldController {
     $handles = array();
     if ($data) {
       $phids = ipull($data, 'objectPHID', 'objectPHID');
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->loadHandles();
     }
 
     $rows = array();

src/applications/maniphest/controller/ManiphestBatchEditController.php

@@ -55,8 +55,7 @@ final class ManiphestBatchEditController extends ManiphestController {
     $panel->setHeader('Maniphest Batch Editor');
 
     $handle_phids = mpull($tasks, 'getOwnerPHID');
-    $handles = id(new PhabricatorObjectHandleData($handle_phids))
+    $handles = $this->loadViewerHandles($handle_phids);
-      ->loadHandles();
 
     $list = new ManiphestTaskListView();
     $list->setTasks($tasks);

src/applications/maniphest/controller/ManiphestExportController.php

@@ -90,8 +90,7 @@ final class ManiphestExportController extends ManiphestController {
     $tasks = array_mergev($tasks);
 
     $all_projects = array_mergev(mpull($tasks, 'getProjectPHIDs'));
-    $project_handles = id(new PhabricatorObjectHandleData($all_projects))
+    $project_handles = $this->loadViewerHandles($all_projects);
-      ->loadHandles();
     $handles += $project_handles;
 
     $workbook = new PHPExcel();

src/applications/maniphest/controller/ManiphestReportController.php

@@ -92,7 +92,7 @@ final class ManiphestReportController extends ManiphestController {
     $project_phid = $request->getStr('project');
     if ($project_phid) {
       $phids = array($project_phid);
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
       $handle = $handles[$project_phid];
     }
 
@@ -403,7 +403,7 @@ final class ManiphestReportController extends ManiphestController {
     $project_handle = null;
     if ($project_phid) {
       $phids = array($project_phid);
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
       $project_handle = $handles[$project_phid];
 
       $query->withProjects($phids);
@@ -475,7 +475,7 @@ final class ManiphestReportController extends ManiphestController {
     }
 
     $phids = array_keys($result);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
     $handles = msort($handles, 'getName');
 
     $order = $request->getStr('order', 'name');

src/applications/maniphest/controller/ManiphestTaskDescriptionChangeController.php

@@ -61,7 +61,7 @@ final class ManiphestTaskDescriptionChangeController
         $phids[$phid] = $phid;
       }
     }
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $engine = new PhabricatorMarkupEngine();
     $engine->addObject($transaction, ManiphestTransaction::MARKUP_FIELD_BODY);

src/applications/maniphest/controller/ManiphestTaskDetailController.php

@@ -105,8 +105,7 @@ final class ManiphestTaskDetailController extends ManiphestController {
 
     $phids = array_keys($phids);
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $dict = array();
     $dict['Status'] =

src/applications/maniphest/controller/ManiphestTaskEditController.php

@@ -318,8 +318,7 @@ final class ManiphestTaskEditController extends ManiphestController {
     $phids = array_filter($phids);
     $phids = array_unique($phids);
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $tvalues = mpull($handles, 'getFullName', 'getPHID');
 

src/applications/maniphest/controller/ManiphestTransactionPreviewController.php

@@ -113,8 +113,7 @@ final class ManiphestTransactionPreviewController extends ManiphestController {
     }
     $phids[] = $user->getPHID();
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $transactions   = array();
     $transactions[] = $transaction;

src/applications/metamta/controller/PhabricatorMetaMTAReceiveController.php

@@ -49,8 +49,7 @@ final class PhabricatorMetaMTAReceiveController
       $received->processReceivedMail();
 
       $phid = $receiver->getPHID();
-      $handles = id(new PhabricatorObjectHandleData(array($phid)))
+      $handles = $this->loadViewerHandles(array($phid));
-        ->loadHandles();
       $uri = $handles[$phid]->getURI();
 
       return id(new AphrontRedirectResponse())->setURI($uri);

src/applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php

@@ -40,7 +40,7 @@ final class PhabricatorMetaMTAReceivedListController
     );
     $phids = array_unique(array_filter($phids));
 
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($mails as $mail) {

src/applications/owners/controller/PhabricatorOwnersDetailController.php

@@ -59,9 +59,7 @@ final class PhabricatorOwnersDetailController
     }
     $phids = array_keys($phids);
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->setViewer($this->getRequest()->getUser())
-      ->loadHandles();
 
     $rows = array();
 
@@ -216,9 +214,7 @@ final class PhabricatorOwnersDetailController
       $phids[] = $commit_view['view']->getRequiredHandlePHIDs();
     }
     $phids = array_mergev($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->setViewer($user)
-      ->loadHandles();
 
     $commit_panels = array();
     foreach ($commit_views as $commit_view) {

src/applications/owners/controller/PhabricatorOwnersEditController.php

@@ -129,8 +129,7 @@ final class PhabricatorOwnersEditController
       $error_view->setErrors($errors);
     }
 
-    $handles = id(new PhabricatorObjectHandleData($owners))
+    $handles = $this->loadViewerHandles($owners);
-      ->loadHandles();
 
     $primary = $package->getPrimaryOwnerPHID();
     if ($primary && isset($handles[$primary])) {

src/applications/owners/controller/PhabricatorOwnersListController.php

@@ -145,8 +145,7 @@ final class PhabricatorOwnersListController
     if ($request->getArr('owner')) {
       $phids = $request->getArr('owner');
       $phid = reset($phids);
-      $handles = id(new PhabricatorObjectHandleData(array($phid)))
+      $handles = $this->loadViewerHandles(array($phid));
-        ->loadHandles();
       $owners_search_value = array(
         $phid => $handles[$phid]->getFullName(),
       );
@@ -222,9 +221,7 @@ final class PhabricatorOwnersListController
         $phids[$owner->getUserPHID()] = true;
       }
       $phids = array_keys($phids);
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->setViewer($this->getRequest()->getUser())
-        ->loadHandles();
 
       $repository_phids = array();
       foreach ($paths as $path) {

src/applications/people/controller/PhabricatorPeopleLogsController.php

@@ -39,7 +39,7 @@ final class PhabricatorPeopleLogsController
 
     $phids = array_merge($filter_user, $filter_actor);
     if ($phids) {
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
       if ($filter_user) {
         $filter_user = reset($filter_user);
         $user_value = array(
@@ -165,7 +165,7 @@ final class PhabricatorPeopleLogsController
       $phids[$log->getUserPHID()] = true;
     }
     $phids = array_keys($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($logs as $log) {

src/applications/phame/controller/blog/PhameBlogViewController.php

@@ -84,8 +84,7 @@ final class PhameBlogViewController
 
     $blogger_phids = $this->getBloggerPHIDs();
     if ($blogger_phids) {
-      $bloggers = id(new PhabricatorObjectHandleData($blogger_phids))
+      $bloggers = $this->loadViewerHandles($blogger_phids);
-        ->loadHandles();
     } else {
       $bloggers = array();
     }

src/applications/phame/controller/post/list/PhamePostListBaseController.php

@@ -67,7 +67,7 @@ abstract class PhamePostListBaseController
     $blogger_phids = mpull($posts, 'getBloggerPHID', 'getBloggerPHID');
 
     return
-      id(new PhabricatorObjectHandleData($blogger_phids))->loadHandles();
+      $this->loadViewerHandles($blogger_phids);
   }
 
   protected function buildPostListPageResponse() {

src/applications/phid/controller/PhabricatorPHIDLookupController.php

@@ -24,8 +24,7 @@ final class PhabricatorPHIDLookupController
     $request = $this->getRequest();
     $phids = $request->getStrList('phids');
     if ($phids) {
-      $handles = id(new PhabricatorObjectHandleData($phids))
+      $handles = $this->loadViewerHandles($phids);
-        ->loadHandles();
 
       $rows = array();
       foreach ($handles as $handle) {

src/applications/phriction/controller/PhrictionDiffController.php

@@ -238,7 +238,7 @@ final class PhrictionDiffController
     $user = $this->getRequest()->getUser();
 
     $phids = mpull($content, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($content as $c) {

src/applications/phriction/controller/PhrictionDocumentController.php

@@ -125,7 +125,7 @@ final class PhrictionDocumentController
           $content->getAuthorPHID(),
           $project_phid,
         ));
-      $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+      $handles = $this->loadViewerHandles($phids);
 
       $age = time() - $content->getDateCreated();
       $age = floor($age / (60 * 60 * 24));
@@ -234,8 +234,7 @@ final class PhrictionDocumentController
       $ancestor_phids = mpull($ancestors, 'getPHID');
       $handles = array();
       if ($ancestor_phids) {
-        $handles = id(new PhabricatorObjectHandleData($ancestor_phids))
+        $handles = $this->loadViewerHandles($ancestor_phids);
-          ->loadHandles();
       }
 
       $ancestor_handles = array();

src/applications/phriction/controller/PhrictionHistoryController.php

@@ -55,8 +55,7 @@ final class PhrictionHistoryController
     $history = $pager->sliceResults($history);
 
     $author_phids = mpull($history, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($author_phids))
+    $handles = $this->loadViewerHandles($author_phids);
-      ->loadHandles();
 
     $rows = array();
     foreach ($history as $content) {

src/applications/phriction/controller/PhrictionListController.php

@@ -65,7 +65,7 @@ final class PhrictionListController
     $content = mpull($documents, 'getContent');
     $phids = mpull($content, 'getAuthorPHID');
 
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
 
     $rows = array();

src/applications/ponder/controller/PonderAnswerPreviewController.php

@@ -32,8 +32,7 @@ final class PonderAnswerPreviewController
 
     $author_phid = $user->getPHID();
     $object_phids = array($author_phid);
-    $handles = id(new PhabricatorObjectHandleData($object_phids))
+    $handles = $this->loadViewerHandles($object_phids);
-      ->loadHandles();
 
     $answer = new PonderAnswer();
     $answer->setContent($request->getStr('content'));

src/applications/ponder/controller/PonderFeedController.php

@@ -86,8 +86,7 @@ final class PonderFeedController extends PonderController {
         foreach ($data as $question) {
           $phids[] = $question->getAuthorPHID();
         }
-        $handles = id(new PhabricatorObjectHandleData($phids))
+        $handles = $this->loadViewerHandles($phids);
-          ->loadHandles();
 
         $side_nav->appendChild(
           id(new PonderQuestionFeedView())
@@ -115,8 +114,7 @@ final class PonderFeedController extends PonderController {
         );
 
         $phids = array($user->getPHID());
-        $handles = id(new PhabricatorObjectHandleData($phids))
+        $handles = $this->loadViewerHandles($phids);
-          ->loadHandles();
 
         $side_nav->appendChild(
           id(new PonderUserProfileView())

src/applications/ponder/controller/PonderQuestionPreviewController.php

@@ -29,8 +29,7 @@ final class PonderQuestionPreviewController
     $author_phid = $user->getPHID();
 
     $object_phids = array($author_phid);
-    $handles = id(new PhabricatorObjectHandleData($object_phids))
+    $handles = $this->loadViewerHandles($object_phids);
-      ->loadHandles();
 
     $question = new PonderQuestion();
     $question->setContent($request->getStr('content'));

src/applications/ponder/controller/PonderQuestionViewController.php

@@ -41,8 +41,7 @@ final class PonderQuestionViewController extends PonderController {
       $object_phids[] = $answer->getAuthorPHID();
     }
 
-    $handles = id(new PhabricatorObjectHandleData($object_phids))
+    $handles = $this->loadViewerHandles($object_phids);
-      ->loadHandles();
 
     $detail_panel = new PonderQuestionDetailView();
     $detail_panel

src/applications/project/controller/PhabricatorProjectMembersEditController.php

@@ -87,8 +87,7 @@ final class PhabricatorProjectMembersEditController
     }
 
     $member_phids = array_reverse($member_phids);
-    $handles = id(new PhabricatorObjectHandleData($member_phids))
+    $handles = $this->loadViewerHandles($member_phids);
-      ->loadHandles();
 
     $state = array();
     foreach ($handles as $handle) {

src/applications/project/controller/PhabricatorProjectProfileController.php

@@ -149,8 +149,7 @@ final class PhabricatorProjectProfileController
 
     $phids = array($project->getAuthorPHID());
     $phids = array_unique($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $timestamp = phabricator_datetime($project->getDateCreated(), $viewer);
 
@@ -187,8 +186,7 @@ final class PhabricatorProjectProfileController
     PhabricatorProjectProfile $profile) {
 
     $member_phids = $project->getMemberPHIDs();
-    $handles = id(new PhabricatorObjectHandleData($member_phids))
+    $handles = $this->loadViewerHandles($member_phids);
-      ->loadHandles();
 
     $affiliated = array();
     foreach ($handles as $phids => $handle) {
@@ -259,8 +257,7 @@ final class PhabricatorProjectProfileController
 
     $phids = mpull($tasks, 'getOwnerPHID');
     $phids = array_filter($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $task_views = array();
     foreach ($tasks as $task) {

src/applications/search/controller/PhabricatorSearchAttachController.php

@@ -109,8 +109,7 @@ final class PhabricatorSearchAttachController
 
     $strings = $this->getStrings();
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $obj_dialog = new PhabricatorObjectSelectorDialog();
     $obj_dialog
@@ -279,8 +278,7 @@ final class PhabricatorSearchAttachController
   private function raiseGraphCycleException(PhabricatorEdgeCycleException $ex) {
     $cycle = $ex->getCycle();
 
-    $handles = id(new PhabricatorObjectHandleData($cycle))
+    $handles = $this->loadViewerHandles($cycle);
-      ->loadHandles();
     $names = array();
     foreach ($cycle as $cycle_phid) {
       $names[] = $handles[$cycle_phid]->getFullName();

src/applications/search/controller/PhabricatorSearchController.php

@@ -128,8 +128,7 @@ final class PhabricatorSearchController
       $query->getParameter('project', array())
     );
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $author_value = array_select_keys(
       $handles,

src/applications/search/controller/PhabricatorSearchIndexController.php

@@ -103,7 +103,7 @@ final class PhabricatorSearchIndexController
     $relationships = $document->getRelationshipData();
 
     $phids = ipull($relationships, 1);
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($relationships as $relationship) {

src/applications/search/controller/PhabricatorSearchSelectController.php

@@ -64,8 +64,7 @@ final class PhabricatorSearchSelectController
     $phids += $this->queryObjectNames($query_str);
 
     $phids = array_keys($phids);
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $data = array();
     foreach ($handles as $handle) {

src/applications/slowvote/controller/PhabricatorSlowvoteListController.php

@@ -56,7 +56,7 @@ final class PhabricatorSlowvoteListController
     $polls = $this->loadPolls($pager, $view);
 
     $phids = mpull($polls, 'getAuthorPHID');
-    $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+    $handles = $this->loadViewerHandles($phids);
 
     $rows = array();
     foreach ($polls as $poll) {

src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php

@@ -170,7 +170,7 @@ final class PhabricatorTypeaheadCommonDatasourceController
 
       if ($need_rich_data) {
         $phids = mpull($users, 'getPHID');
-        $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
+        $handles = $this->loadViewerHandles($phids);
       }
 
       foreach ($users as $user) {

src/infrastructure/diff/PhabricatorInlineCommentController.php

@@ -226,8 +226,7 @@ abstract class PhabricatorInlineCommentController
 
     $phids = array($user->getPHID());
 
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $view = new DifferentialInlineCommentView();
     $view->setInlineComment($inline);

src/infrastructure/diff/PhabricatorInlineCommentPreviewController.php

@@ -30,8 +30,7 @@ abstract class PhabricatorInlineCommentPreviewController
     $engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
 
     $phids = array($user->getPHID());
-    $handles = id(new PhabricatorObjectHandleData($phids))
+    $handles = $this->loadViewerHandles($phids);
-      ->loadHandles();
 
     $views = array();
     foreach ($inlines as $inline) {