eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
An empty list still exists; we should not return a 404 for empty lists.

This reverts commit 355effe6315ab7927a54f44fc9ce903085769b5f.
This commit is contained in:
Evan Prodromou 2009-08-14 13:05:57 -07:00
parent 1b204fde39
commit 6c597eabec
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
actions/public.php
View File

@ -59,7 +59,6 @@ class PublicAction extends Action
*/ */
var $page = null; var $page = null;
var $notice;
function isReadOnly($args) function isReadOnly($args)
{ {
@ -85,18 +84,6 @@ 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;
} }
@ -217,7 +204,15 @@ class PublicAction extends Action
function showContent() function showContent()
{ {
$nl = new NoticeList($this->notice, $this); $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);
$cnt = $nl->show(); $cnt = $nl->show();