diff --git a/src/applications/feed/controller/PhabricatorFeedDetailController.php b/src/applications/feed/controller/PhabricatorFeedDetailController.php index 459011af80..4fac10d1a8 100644 --- a/src/applications/feed/controller/PhabricatorFeedDetailController.php +++ b/src/applications/feed/controller/PhabricatorFeedDetailController.php @@ -2,19 +2,13 @@ final class PhabricatorFeedDetailController extends PhabricatorFeedController { - private $id; - - public function willProcessRequest(array $data) { - $this->id = $data['id']; - } - - public function processRequest() { - $request = $this->getRequest(); - $user = $request->getUser(); + public function handleRequest(AphrontRequest $request) { + $viewer = $request->getViewer(); + $id = $request->getURIData('id'); $story = id(new PhabricatorFeedQuery()) - ->setViewer($user) - ->withChronologicalKeys(array($this->id)) + ->setViewer($viewer) + ->withChronologicalKeys(array($id)) ->executeOne(); if (!$story) { return new Aphront404Response(); @@ -27,7 +21,7 @@ final class PhabricatorFeedDetailController extends PhabricatorFeedController { $feed = array($story); $builder = new PhabricatorFeedBuilder($feed); - $builder->setUser($user); + $builder->setUser($viewer); $feed_view = $builder->buildView(); $title = pht('Story'); diff --git a/src/applications/feed/controller/PhabricatorFeedListController.php b/src/applications/feed/controller/PhabricatorFeedListController.php index f317b477be..8451592362 100644 --- a/src/applications/feed/controller/PhabricatorFeedListController.php +++ b/src/applications/feed/controller/PhabricatorFeedListController.php @@ -2,19 +2,15 @@ final class PhabricatorFeedListController extends PhabricatorFeedController { - private $queryKey; - public function shouldAllowPublic() { return true; } - public function willProcessRequest(array $data) { - $this->queryKey = idx($data, 'queryKey'); - } + public function handleRequest(AphrontRequest $request) { + $querykey = $request->getURIData('queryKey'); - public function processRequest() { $controller = id(new PhabricatorApplicationSearchController()) - ->setQueryKey($this->queryKey) + ->setQueryKey($querykey) ->setSearchEngine(new PhabricatorFeedSearchEngine()) ->setNavigation($this->buildSideNavView());