diff options
| author | Robin Millette <millette@controlyourself.ca> | 2009-06-10 14:18:41 -0400 |
|---|---|---|
| committer | Robin Millette <millette@controlyourself.ca> | 2009-06-10 14:18:41 -0400 |
| commit | ba6beaa3104c81b8b6e624aad28c9f0ce89af8dc (patch) | |
| tree | ceed868811c836ab46d60c6c73ab6f386b75d8d6 /classes/Notice_inbox.php | |
| parent | e120cb1a5300f2e38820aa05ec9ac21073a934e0 (diff) | |
| parent | 5469e46ef5bd464559a648fdc02b285313132155 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'classes/Notice_inbox.php')
| -rw-r--r-- | classes/Notice_inbox.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index dec14b0d1..8a27e1747 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -43,15 +43,15 @@ class Notice_inbox extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function stream($user_id, $offset, $limit, $since_id, $before_id, $since) + function stream($user_id, $offset, $limit, $since_id, $max_id, $since) { return Notice::stream(array('Notice_inbox', '_streamDirect'), array($user_id), 'notice_inbox:by_user:'.$user_id, - $offset, $limit, $since_id, $before_id, $since); + $offset, $limit, $since_id, $max_id, $since); } - function _streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since) + function _streamDirect($user_id, $offset, $limit, $since_id, $max_id, $since) { $inbox = new Notice_inbox(); @@ -61,8 +61,8 @@ class Notice_inbox 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)) { |