diff options
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 43556a0ed..d0f72280b 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -337,31 +337,27 @@ class ShowstreamAction extends StreamAction { function show_notices($profile) { - $notice = DB_DataObject::factory('notice'); - $notice->profile_id = $profile->id; - - $notice->orderBy('created DESC, notice.id DESC'); - $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); - - $cnt = $notice->find(); + $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + $cnt = 0; - if ($cnt > 0) { + if ($notice) { + common_element_start('ul', array('id' => 'notices')); - - for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) { - if ($notice->fetch()) { - $this->show_notice($notice); - } else { - // shouldn't happen! + + while ($notice->fetch()) { + $cnt++; + if ($cnt > NOTICES_PER_PAGE) { break; } + $this->show_notice($notice); } common_element_end('ul'); } + common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page, 'showstream', array('nickname' => $profile->nickname)); } |