diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php index 323cb7a564..d186ac6f16 100644 --- a/src/applications/diffusion/controller/DiffusionCommitController.php +++ b/src/applications/diffusion/controller/DiffusionCommitController.php @@ -782,6 +782,7 @@ final class DiffusionCommitController extends DiffusionController { } $history_table = new DiffusionHistoryTableView(); + $history_table->setUser($this->getRequest()->getUser()); $history_table->setDiffusionRequest($drequest); $history_table->setHistory($merges); $history_table->loadRevisions(); diff --git a/src/applications/diffusion/controller/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php index 3890d99d0c..074bbe7840 100644 --- a/src/applications/diffusion/controller/DiffusionHistoryController.php +++ b/src/applications/diffusion/controller/DiffusionHistoryController.php @@ -56,6 +56,7 @@ final class DiffusionHistoryController extends DiffusionController { phutil_escape_html($button_title)); $history_table = new DiffusionHistoryTableView(); + $history_table->setUser($request->getUser()); $history_table->setDiffusionRequest($drequest); $history_table->setHistory($history); $history_table->loadRevisions(); diff --git a/src/applications/diffusion/controller/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php index 64ab74c2cc..3c805032a6 100644 --- a/src/applications/diffusion/controller/DiffusionLastModifiedController.php +++ b/src/applications/diffusion/controller/DiffusionLastModifiedController.php @@ -23,8 +23,10 @@ final class DiffusionLastModifiedController extends DiffusionController { $phids = array_keys($phids); $handles = $this->loadViewerHandles($phids); - $output = DiffusionBrowseTableView::renderLastModifiedColumns( - $drequest, + $view = new DiffusionBrowseTableView(); + $view->setUser($request->getUser()); + $view->setDiffusionRequest($drequest); + $output = $view->renderLastModifiedColumns( $handles, $commit, $commit_data); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php index 94b0916a02..b0c68c195c 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php @@ -51,6 +51,7 @@ final class DiffusionRepositoryController extends DiffusionController { $handles = $this->loadViewerHandles($phids); $history_table = new DiffusionHistoryTableView(); + $history_table->setUser($this->getRequest()->getUser()); $history_table->setDiffusionRequest($drequest); $history_table->setHandles($handles); $history_table->setHistory($history); diff --git a/src/applications/diffusion/view/DiffusionBrowseTableView.php b/src/applications/diffusion/view/DiffusionBrowseTableView.php index 6eaf4a1f31..981a6ac707 100644 --- a/src/applications/diffusion/view/DiffusionBrowseTableView.php +++ b/src/applications/diffusion/view/DiffusionBrowseTableView.php @@ -17,20 +17,21 @@ final class DiffusionBrowseTableView extends DiffusionView { return $this; } - public static function renderLastModifiedColumns( - DiffusionRequest $drequest, + public function renderLastModifiedColumns( array $handles, PhabricatorRepositoryCommit $commit = null, PhabricatorRepositoryCommitData $data = null) { assert_instances_of($handles, 'PhabricatorObjectHandle'); + $drequest = $this->getDiffusionRequest(); + if ($commit) { $epoch = $commit->getEpoch(); $modified = DiffusionView::linkCommit( $drequest->getRepository(), $commit->getCommitIdentifier()); - $date = date('M j, Y', $epoch); - $time = date('g:i A', $epoch); + $date = phabricator_date($epoch, $this->user); + $time = phabricator_time($epoch, $this->user); } else { $modified = ''; $date = ''; @@ -169,8 +170,7 @@ final class DiffusionBrowseTableView extends DiffusionView { if ($commit) { $drequest = clone $request; $drequest->setPath($request->getPath().$path->getPath().$dir_slash); - $dict = self::renderLastModifiedColumns( - $drequest, + $dict = $this->renderLastModifiedColumns( $this->handles, $commit, $path->getLastCommitData()); diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php index 6c577a586c..73dd317a3d 100644 --- a/src/applications/diffusion/view/DiffusionHistoryTableView.php +++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php @@ -74,8 +74,8 @@ final class DiffusionHistoryTableView extends DiffusionView { $epoch = $history->getEpoch(); if ($epoch) { - $date = date('M j, Y', $epoch); - $time = date('g:i A', $epoch); + $date = phabricator_date($epoch, $this->user); + $time = phabricator_time($epoch, $this->user); } else { $date = null; $time = null;