Revert "Return a 404 when a page is request that has no notices"

An empty list still exists; we should not return a 404 for empty lists.

This reverts commit 355effe6315ab7927a54f44fc9ce903085769b5f.

diff --git a/actions/public.php b/actions/public.php
index ca352faf85a068ea20d79db458248f9348e381c2..dd128925b5eb2087159ce226970e692402413df3 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -59,7 +59,6 @@ class PublicAction extends Action
      */
 
     var $page = null;
-    var $notice;
 
     function isReadOnly($args)
     {
@@ -85,18 +84,6 @@ class PublicAction extends Action
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
-                                       NOTICES_PER_PAGE + 1);
-
-        if (!$this->notice) {
-            $this->serverError(_('Could not retrieve public stream.'));
-            return;
-        }
-
-        if($this->page > 0 && $this->notice->N == 0){
-            $this->serverError(_('No such page'),$code=404);
-        }
-
         return true;
     }
 
@@ -217,7 +204,15 @@ class PublicAction extends Action
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this);
+        $notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
+                                       NOTICES_PER_PAGE + 1);
+
+        if (!$notice) {
+            $this->serverError(_('Could not retrieve public stream.'));
+            return;
+        }
+
+        $nl = new NoticeList($notice, $this);
 
         $cnt = $nl->show();