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 5933d009466047ff4e345133c6e5598cea985502..fb0b63577afbb17377f4cb4ebd4dc0a163ec4551 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -57,8 +57,8 @@ 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;
@@ -156,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);
             }