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/Notice_tag.php | |
parent | e3c2b8e0b50d750ad35cb313726fd2706684c09b (diff) | |
parent | b1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Notice_tag.php')
-rw-r--r-- | classes/Notice_tag.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php index 4fd76e8ea..a5d0716a7 100644 --- a/classes/Notice_tag.php +++ b/classes/Notice_tag.php @@ -46,7 +46,7 @@ class Notice_tag extends Memcached_DataObject return Notice::getStreamByIds($ids); } - function _streamDirect($tag, $offset, $limit, $since_id, $max_id, $since) + function _streamDirect($tag, $offset, $limit, $since_id, $max_id) { $nt = new Notice_tag(); @@ -63,10 +63,6 @@ class Notice_tag extends Memcached_DataObject $nt->whereAdd('notice_id < ' . $max_id); } - if (!is_null($since)) { - $nt->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\''); - } - $nt->orderBy('notice_id DESC'); if (!is_null($offset)) { |