isReadOnly() now takes arguments

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

diff --git a/actions/public.php b/actions/public.php
index b7b7fc6b767913e043cf7dea9a8d3e02ea169551..27153f13159daf2c990ba7937cc697e0724ad27f 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -56,7 +56,7 @@ class PublicAction extends Action
 
     var $page = null;
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -166,19 +166,8 @@ class PublicAction extends Action
         $nav->show();
     }
 
-    function showPageNotice()
+    function showEmptyList()
     {
-        $notice = new Notice;
-
-        if (!$notice) {
-            $this->serverError(_('Could not retrieve public stream.'));
-            return;
-        }
-
-        if ($notice->count()) {
-            return;
-        }
-
         $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
 
         if (common_logged_in()) {
@@ -216,6 +205,10 @@ class PublicAction extends Action
 
         $cnt = $nl->show();
 
+        if ($cnt == 0) {
+            $this->showEmptyList();
+        }
+
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'public');
     }