summaryrefslogtreecommitdiff
path: root/actions/replies.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-16 10:37:15 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-16 10:37:15 -0400
commitb936a5166d825239b269bf9ee9ea5627f452a188 (patch)
tree75c7c804cfd510aa4d0317bcd885745075dc476c /actions/replies.php
parente0815de960cd283e7eea7e242ce4bf5a56be66fc (diff)
Revert "Revert "Return a 404 when a page is request that has no notices""
This reverts commit 1b204fde39271acd38bb8f9dd16734f15c68138a.
Diffstat (limited to 'actions/replies.php')
-rw-r--r--actions/replies.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/actions/replies.php b/actions/replies.php
index f14383d33..fcfc3a272 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -48,6 +48,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
class RepliesAction extends OwnerDesignAction
{
var $page = null;
+ var $notice;
/**
* Prepare the object
@@ -84,6 +85,13 @@ class RepliesAction extends OwnerDesignAction
common_set_returnto($this->selfUrl());
+ $this->notice = $this->user->getReplies(($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;
}
@@ -159,10 +167,7 @@ class RepliesAction extends OwnerDesignAction
function showContent()
{
- $notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
-
- $nl = new NoticeList($notice, $this);
+ $nl = new NoticeList($this->notice, $this);
$cnt = $nl->show();
if (0 === $cnt) {