summaryrefslogtreecommitdiff
path: root/actions/public.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-12-11 18:12:52 -0500
committerEvan Prodromou <evan@controlyourself.ca>2008-12-11 18:12:52 -0500
commit8dcce13297dce70d993956c2e05f2b91f3c19c46 (patch)
treeca9f3659a0e9195498ea07f61cf008ed0e8abea2 /actions/public.php
parentd3f0a9eeee1574c095274853311c7c2998d7a200 (diff)
make a new NoticeList widget and call it from StreamAction
I made a new notice-list widget (like the profile list) and call it from StreamAction. This cleans up some of the mess in the various notice-stream-showing classes. I also changed show-stream so it uses a subclass of NoticeList that doesn't show author info (which is unnecessary). darcs-hash:20081211231252-5ed1f-ee6e551ed5a029406748120f12e2ff57c4a86493.gz
Diffstat (limited to 'actions/public.php')
-rw-r--r--actions/public.php16
1 files changed, 5 insertions, 11 deletions
diff --git a/actions/public.php b/actions/public.php
index 8a41dcd56..218f80194 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -54,7 +54,6 @@ class PublicAction extends StreamAction {
$this->public_views_menu();
-
$this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
'type' => 'rss',
'version' => 'RSS 1.0',
@@ -87,18 +86,13 @@ class PublicAction extends StreamAction {
$notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
NOTICES_PER_PAGE + 1);
- if ($notice) {
- common_element_start('ul', array('id' => 'notices'));
- while ($notice->fetch()) {
- $cnt++;
- if ($cnt > NOTICES_PER_PAGE) {
- break;
- }
- $this->show_notice($notice);
- }
- common_element_end('ul');
+ if (!$notice) {
+ $this->server_error(_('Could not retrieve public stream.'));
+ return;
}
+ $cnt = $this->show_notice_list($notice);
+
common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
$page, 'public');
}