Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/tag.php b/actions/tag.php
index 0fc2c5152e530acb3b186503ba4b305819a1bc64..9159e7c043b9509c28787bfb0a109c50facae7f4 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -46,11 +46,12 @@ class TagAction extends ManagedAction
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+        $this->notice = Notice_tag::getStream($this->tag)->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                                                       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.'),$code=404);
+            // TRANS: Client error when page not found (404).
+            $this->clientError(_('No such page.'), 404);
         }
 
         return true;
@@ -121,7 +122,7 @@ class TagAction extends ManagedAction
         }
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }