From 1b204fde39271acd38bb8f9dd16734f15c68138a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 14 Aug 2009 13:05:29 -0700 Subject: 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. --- actions/replies.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'actions/replies.php') diff --git a/actions/replies.php b/actions/replies.php index fcfc3a272..f14383d33 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/feedlist.php'; class RepliesAction extends OwnerDesignAction { var $page = null; - var $notice; /** * Prepare the object @@ -85,13 +84,6 @@ 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; } @@ -167,7 +159,10 @@ class RepliesAction extends OwnerDesignAction function showContent() { - $nl = new NoticeList($this->notice, $this); + $notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); + + $nl = new NoticeList($notice, $this); $cnt = $nl->show(); if (0 === $cnt) { -- cgit v1.2.3-54-g00ecf