summaryrefslogtreecommitdiff
path: root/actions/tag.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-14 13:05:29 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-08-14 13:05:29 -0700
commit1b204fde39271acd38bb8f9dd16734f15c68138a (patch)
tree946f756cde56cee6d0fe8e131c863639a8ad6113 /actions/tag.php
parent2cf50ea432eab61e8cc2b007d486d0de3cd5aecf (diff)
Revert "Return a 404 when a page is request that has no notices"
An empty list still exists; we shouldn't return a 404. This reverts commit c29892c87573e0575b9a4a13210c562e08411148.
Diffstat (limited to 'actions/tag.php')
-rw-r--r--actions/tag.php13
1 files changed, 3 insertions, 10 deletions
diff --git a/actions/tag.php b/actions/tag.php
index 771eb2861..020399d9e 100644
--- 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();