diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-08-12 10:50:46 -0700 |
commit | 7d33478e867cc6610aded42a8f2fa71bae46804d (patch) | |
tree | 73a422fac7006ee40ff51c21922ca22f68cab40d /actions/tag.php | |
parent | 01dccefcccc8ca4c1fec419f47cf723d0498c3ef (diff) | |
parent | 853b6d38b362e3a905195d9ff850c9a884d412bd (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
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(); |