From b936a5166d825239b269bf9ee9ea5627f452a188 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 16 Aug 2009 10:37:15 -0400 Subject: Revert "Revert "Return a 404 when a page is request that has no notices"" This reverts commit 1b204fde39271acd38bb8f9dd16734f15c68138a. --- actions/replies.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'actions/replies.php') 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) { -- cgit v1.2.3-54-g00ecf