Page MenuHomestyx hydra
Files F208443

No OneTemporary
Actions

View Options

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 @@
<?php
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();
}
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 @@
<?php
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());
return $this->delegateToController($controller);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Jul 3, 2:14 PM (4 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
165863
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)