X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;fp=actions%2Fall.php;h=9cab91264f00bd2337127dbaba6cdb27f3116db3;hb=51ecd6be15098c1e8ac8701f846c22f9f630d5c0;hp=fb0b63577afbb17377f4cb4ebd4dc0a163ec4551;hpb=7601e10b6a99fbadf593cf4df18e914c96de93f0;p=quix0rs-gnu-social.git diff --git a/actions/all.php b/actions/all.php index fb0b63577a..9cab91264f 100644 --- a/actions/all.php +++ b/actions/all.php @@ -41,13 +41,9 @@ class AllAction extends ProfileAction { var $notice; - protected function prepare(array $args=array()) + protected function profileActionPreparation() { - parent::prepare($args); - - $user = common_current_user(); - - if (!empty($user) && $user->streamModeOnly()) { + if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) { $stream = new InboxNoticeStream($this->target, $this->scoped); } else { $stream = new ThreadingInboxNoticeStream($this->target, $this->scoped); @@ -60,8 +56,6 @@ class AllAction extends ProfileAction // TRANS: Client error when page not found (404). $this->clientError(_('No such page.'), 404); } - - return true; } function title()