GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "Revert "Return a 404 when a page is request that has no notices""

Browse Source 
This reverts commit 6c597eabec.
This commit is contained in:
Evan Prodromou 2009-08-16 10:37:04 -04:00
parent 6c597eabec
commit e0815de960
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
actions/public.php
View File

@ -59,6 +59,7 @@ class PublicAction extends Action
*/ */
var $page = null; var $page = null;
var $notice;
function isReadOnly($args) function isReadOnly($args)
{ {
@ -84,6 +85,18 @@ class PublicAction extends Action
common_set_returnto($this->selfUrl()); 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; return true;
} }
@ -204,15 +217,7 @@ class PublicAction extends Action
function showContent() function showContent()
{ {
$notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE, $nl = new NoticeList($this->notice, $this);
NOTICES_PER_PAGE + 1);
if (!$notice) {
$this->serverError(_('Could not retrieve public stream.'));
return;
}
$nl = new NoticeList($notice, $this);
$cnt = $nl->show(); $cnt = $nl->show();