summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2008-09-28 09:27:47 -0400
committerEvan Prodromou <evan@controlyourself.ca>2008-09-28 09:27:47 -0400
commitd3d5942ae386aa50364d4725be95d93e9cc25472 (patch)
treea18634c854c69b065f42b7ccacd78732a5b546e9
parent3544fca93240cfcf1bcd803dbdd07541a1cea1c5 (diff)
change arguments to Notice::publicStream
darcs-hash:20080928132747-5ed1f-9e9b6d8b91f855758ca4b269418f6d5d6e4a2ae0.gz
-rw-r--r--actions/public.php3
-rw-r--r--classes/Notice.php6
2 files changed, 5 insertions, 4 deletions
diff --git a/actions/public.php b/actions/public.php
index e0b2b1635..43beaffc6 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -60,7 +60,8 @@ class PublicAction extends StreamAction {
function show_notices($page) {
$cnt = 0;
- $notice = Notice::publicStream($page);
+ $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
if ($notice) {
common_element_start('ul', array('id' => 'notices'));
diff --git a/classes/Notice.php b/classes/Notice.php
index 5bf8a2de8..78ebc6aa5 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -290,7 +290,7 @@ class Notice extends Memcached_DataObject
return $wrapper;
}
- function publicStream($page) {
+ function publicStream($offset=0, $limit=20) {
$qry = 'SELECT * FROM notice ';
@@ -300,7 +300,7 @@ class Notice extends Memcached_DataObject
return Notice::getStream($qry,
'public',
- ($page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
+ $offset, $limit);
+);
}
}