Merge branch 'fixes/private_scope_on_tags' into social-master

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index a0e0b9a08b71a59ff2c4e7a7ba19f6cd922361b3..fb0b63577afbb17377f4cb4ebd4dc0a163ec4551 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -41,11 +41,6 @@ class AllAction extends ProfileAction
 {
     var $notice;
 
-    function isReadOnly($args)
-    {
-        return true;
-    }
-
     protected function prepare(array $args=array())
     {
         parent::prepare($args);
@@ -62,25 +57,13 @@ class AllAction extends ProfileAction
                                             NOTICES_PER_PAGE + 1);
 
         if ($this->page > 1 && $this->notice->N == 0) {
-            // TRANS: Server error when page not found (404).
-            $this->serverError(_('No such page.'), 404);
+            // TRANS: Client error when page not found (404).
+            $this->clientError(_('No such page.'), 404);
         }
 
         return true;
     }
 
-    protected function handle()
-    {
-        parent::handle();
-
-        if (!$this->target instanceof Profile) {
-            // TRANS: Client error when user not found for an action.
-            $this->clientError(_('No such user.'));
-        }
-
-        $this->showPage();
-    }
-
     function title()
     {
         if (!empty($this->scoped) && $this->scoped->id == $this->target->id) {
@@ -173,7 +156,7 @@ class AllAction extends ProfileAction
             }
 
             if (!empty($current_user) && $current_user->streamModeOnly()) {
-                $nl = new NoticeList($this->notice, $this);
+                $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
             } else {
                 $nl = new ThreadedNoticeList($this->notice, $this, $profile);
             }
@@ -213,8 +196,6 @@ class AllAction extends ProfileAction
         // XXX: make this a little more convenient
 
         if (!common_config('performance', 'high')) {
-            $pop = new PopularNoticeSection($this, $this->scoped);
-            $pop->show();
             $pop = new InboxTagCloudSection($this, $this->target);
             $pop->show();
         }