summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-16 10:37:04 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-16 10:37:04 -0400
commite0815de960cd283e7eea7e242ce4bf5a56be66fc (patch)
tree946f756cde56cee6d0fe8e131c863639a8ad6113
parent6c597eabecf2368224938a136d7ac588702bbfd7 (diff)
Revert "Revert "Return a 404 when a page is request that has no notices""
This reverts commit 6c597eabecf2368224938a136d7ac588702bbfd7.
-rw-r--r--actions/public.php23
1 files changed, 14 insertions, 9 deletions
diff --git a/actions/public.php b/actions/public.php
index dd128925b..ca352faf8 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -59,6 +59,7 @@ class PublicAction extends Action
*/
var $page = null;
+ var $notice;
function isReadOnly($args)
{
@@ -84,6 +85,18 @@ class PublicAction extends Action
common_set_returnto($this->selfUrl());
+ $this->notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
+
+ if (!$this->notice) {
+ $this->serverError(_('Could not retrieve public stream.'));
+ return;
+ }
+
+ if($this->page > 0 && $this->notice->N == 0){
+ $this->serverError(_('No such page'),$code=404);
+ }
+
return true;
}
@@ -204,15 +217,7 @@ class PublicAction extends Action
function showContent()
{
- $notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
-
- if (!$notice) {
- $this->serverError(_('Could not retrieve public stream.'));
- return;
- }
-
- $nl = new NoticeList($notice, $this);
+ $nl = new NoticeList($this->notice, $this);
$cnt = $nl->show();