summaryrefslogtreecommitdiff
path: root/classes/User_group.php
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-06-10 14:18:41 -0400
committerRobin Millette <millette@controlyourself.ca>2009-06-10 14:18:41 -0400
commitba6beaa3104c81b8b6e624aad28c9f0ce89af8dc (patch)
treeceed868811c836ab46d60c6c73ab6f386b75d8d6 /classes/User_group.php
parente120cb1a5300f2e38820aa05ec9ac21073a934e0 (diff)
parent5469e46ef5bd464559a648fdc02b285313132155 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'classes/User_group.php')
-rw-r--r--classes/User_group.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/User_group.php b/classes/User_group.php
index 7cc31e702..a135015ba 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -58,7 +58,7 @@ class User_group extends Memcached_DataObject
return Notice::getStreamByIds($ids);
}
- function _streamDirect($offset, $limit, $since_id, $before_id, $since)
+ function _streamDirect($offset, $limit, $since_id, $max_id, $since)
{
$inbox = new Group_inbox();
@@ -71,8 +71,8 @@ class User_group extends Memcached_DataObject
$inbox->whereAdd('notice_id > ' . $since_id);
}
- if ($before_id != 0) {
- $inbox->whereAdd('notice_id < ' . $before_id);
+ if ($max_id != 0) {
+ $inbox->whereAdd('notice_id <= ' . $max_id);
}
if (!is_null($since)) {