Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/tag.php b/actions/tag.php
index 09de8b3c25638973434ced16539b2c5e78716c42..ccd2c7fbe09f88cadd7d813d375ca76f676e6a81 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -34,7 +34,7 @@ class TagAction extends ManagedAction
         $this->tag = common_canonical_tag($taginput);
 
         if (empty($this->tag)) {
-            common_redirect(common_local_url('publictagcloud'), 301);
+            throw new ClientException(_('No valid tag data.'));
         }
 
         // after common_canonical_tag we have a lowercase, no-specials tag string
@@ -46,7 +46,8 @@ 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: Client error when page not found (404).