diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-16 10:37:15 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-16 10:37:15 -0400 |
commit | b936a5166d825239b269bf9ee9ea5627f452a188 (patch) | |
tree | 75c7c804cfd510aa4d0317bcd885745075dc476c /actions/tag.php | |
parent | e0815de960cd283e7eea7e242ce4bf5a56be66fc (diff) |
Revert "Revert "Return a 404 when a page is request that has no notices""
This reverts commit 1b204fde39271acd38bb8f9dd16734f15c68138a.
Diffstat (limited to 'actions/tag.php')
-rw-r--r-- | actions/tag.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/actions/tag.php b/actions/tag.php index 020399d9e..771eb2861 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -21,6 +21,9 @@ if (!defined('LACONICA')) { exit(1); } class TagAction extends Action { + + var $notice; + function prepare($args) { parent::prepare($args); @@ -42,6 +45,12 @@ 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; } @@ -94,9 +103,7 @@ class TagAction extends Action function showContent() { - $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); - - $nl = new NoticeList($notice, $this); + $nl = new NoticeList($this->notice, $this); $cnt = $nl->show(); |