diff options
| author | Zach Copley <zach@status.net> | 2010-03-03 00:54:35 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-03 00:54:35 +0000 |
| commit | 097e3f89b630b7a28f27c96f5e9a036df3ed7710 (patch) | |
| tree | b34602a5fcd9cc9474737379ddafde3976c0cb96 /classes/Reply.php | |
| parent | 6c1321b108206d05b75703da22ea8abab82071bf (diff) | |
| parent | 08422dfa17a5c52d51f21087be0f1d8d602ed0af (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Reply.php')
| -rw-r--r-- | classes/Reply.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/classes/Reply.php b/classes/Reply.php index 49b1e05e5..659e04c92 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, $max_id=0, $since=null) + function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { $ids = Notice::stream(array('Reply', '_streamDirect'), array($user_id), 'reply:stream:' . $user_id, - $offset, $limit, $since_id, $max_id, $since); + $offset, $limit, $since_id, $max_id); return $ids; } - function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null) + function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { $reply = new Reply(); $reply->profile_id = $user_id; @@ -44,10 +44,6 @@ class Reply extends Memcached_DataObject $reply->whereAdd('notice_id < ' . $max_id); } - if (!is_null($since)) { - $reply->whereAdd('modified > \'' . date('Y-m-d H:i:s', $since) . '\''); - } - $reply->orderBy('notice_id DESC'); if (!is_null($offset)) { |