diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
| commit | 72460091ddc6763cb8d62f9d865390ea4973dd44 (patch) | |
| tree | 78c13bbd3cc8774ad1bee1c92bfe0982744f8c89 /classes/User_group.php | |
| parent | e3c2b8e0b50d750ad35cb313726fd2706684c09b (diff) | |
| parent | b1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/User_group.php')
| -rw-r--r-- | classes/User_group.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/classes/User_group.php b/classes/User_group.php index 7240e2703..64fe024b3 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -91,7 +91,7 @@ class User_group extends Memcached_DataObject return Notice::getStreamByIds($ids); } - function _streamDirect($offset, $limit, $since_id, $max_id, $since) + function _streamDirect($offset, $limit, $since_id, $max_id) { $inbox = new Group_inbox(); @@ -108,10 +108,6 @@ class User_group extends Memcached_DataObject $inbox->whereAdd('notice_id <= ' . $max_id); } - if (!is_null($since)) { - $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\''); - } - $inbox->orderBy('notice_id DESC'); if (!is_null($offset)) { |