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

correct pagination for noticelist

Browse Source
This commit is contained in:
Evan Prodromou 2011-08-02 11:22:37 -04:00
parent 14fe22e430
commit 5a132dbef0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/noticelist.php
View File

@ -84,7 +84,7 @@ class NoticeList extends Widget
$this->out->elementStart('ol', array('class' => 'notices xoxo')); $this->out->elementStart('ol', array('class' => 'notices xoxo'));
$notices = $this->notice->fetchAll(); $notices = $this->notice->fetchAll();
$total = count($notices);
$notices = array_slice($notices, 0, NOTICES_PER_PAGE); $notices = array_slice($notices, 0, NOTICES_PER_PAGE);
$this->prefill($notices); $this->prefill($notices);
@ -104,7 +104,7 @@ class NoticeList extends Widget
$this->out->elementEnd('ol'); $this->out->elementEnd('ol');
$this->out->elementEnd('div'); $this->out->elementEnd('div');
return count($notices); return $total;
} }
/** /**

4
lib/threadednoticelist.php
View File

@ -77,11 +77,11 @@ class ThreadedNoticeList extends NoticeList
$this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo')); $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
$notices = $this->notice->fetchAll(); $notices = $this->notice->fetchAll();
$total = count($notices);
$notices = array_slice($notices, 0, NOTICES_PER_PAGE); $notices = array_slice($notices, 0, NOTICES_PER_PAGE);
$this->prefill($notices); $this->prefill($notices);
$cnt = 0;
$conversations = array(); $conversations = array();
foreach ($notices as $notice) { foreach ($notices as $notice) {
@ -120,7 +120,7 @@ class ThreadedNoticeList extends NoticeList
$this->out->elementEnd('ol'); $this->out->elementEnd('ol');
$this->out->elementEnd('div'); $this->out->elementEnd('div');
return $cnt; return $total;
} }
/** /**