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/Reply.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/Reply.php')
-rw-r--r-- | classes/Reply.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/Reply.php b/classes/Reply.php index 4439053b4..49b1e05e5 100644 --- a/classes/Reply.php +++ b/classes/Reply.php @@ -22,16 +22,16 @@ class Reply extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) + function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null) { $ids = Notice::stream(array('Reply', '_streamDirect'), array($user_id), 'reply:stream:' . $user_id, - $offset, $limit, $since_id, $before_id, $since); + $offset, $limit, $since_id, $max_id, $since); return $ids; } - function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) + function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null) { $reply = new Reply(); $reply->profile_id = $user_id; @@ -40,8 +40,8 @@ class Reply extends Memcached_DataObject $reply->whereAdd('notice_id > ' . $since_id); } - if ($before_id != 0) { - $reply->whereAdd('notice_id < ' . $before_id); + if ($max_id != 0) { + $reply->whereAdd('notice_id < ' . $max_id); } if (!is_null($since)) { |