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 @@ -1,50 +1,44 @@ 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(); } if ($request->getStr('text')) { $text = $story->renderText(); return id(new AphrontPlainTextResponse())->setContent($text); } $feed = array($story); $builder = new PhabricatorFeedBuilder($feed); - $builder->setUser($user); + $builder->setUser($viewer); $feed_view = $builder->buildView(); $title = pht('Story'); $feed_view = phutil_tag_div('phabricator-feed-frame', $feed_view); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb($title); return $this->buildApplicationPage( array( $crumbs, $feed_view, ), array( 'title' => $title, )); } } 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 @@ -1,24 +1,20 @@ 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()); return $this->delegateToController($controller); } }