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

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

diff --git a/actions/tag.php b/actions/tag.php
index 771eb2861eec50e7f9bcb6da2fee507fd7d6aa0f..020399d9eeddc2b1d6476f4460fcefc117c26646 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -21,9 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
 
 class TagAction extends Action
 {
-
-    var $notice;
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -45,12 +42,6 @@ class TagAction extends Action
 
         common_set_returnto($this->selfUrl());
 
-        $this->notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-        if($this->page > 1 && $this->notice->N == 0){
-            $this->serverError(_('No such page'),$code=404);
-        }
-
         return true;
     }
 
@@ -103,7 +94,9 @@ class TagAction extends Action
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this);
+        $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+
+        $nl = new NoticeList($notice, $this);
 
         $cnt = $nl->show();