summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/public.php23
1 files changed, 9 insertions, 14 deletions
diff --git a/actions/public.php b/actions/public.php
index ca352faf8..dd128925b 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -59,7 +59,6 @@ class PublicAction extends Action
*/
var $page = null;
- var $notice;
function isReadOnly($args)
{
@@ -85,18 +84,6 @@ 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;
}
@@ -217,7 +204,15 @@ class PublicAction extends Action
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();