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/Fave.php | |
parent | e3c2b8e0b50d750ad35cb313726fd2706684c09b (diff) | |
parent | b1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Fave.php')
-rw-r--r-- | classes/Fave.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/classes/Fave.php b/classes/Fave.php index 0b6eec2bc..a04f15e9c 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -77,7 +77,7 @@ class Fave extends Memcached_DataObject return $ids; } - function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id, $since) + function _streamDirect($user_id, $own, $offset, $limit, $since_id, $max_id) { $fav = new Fave(); $qry = null; @@ -100,10 +100,6 @@ class Fave extends Memcached_DataObject $qry .= 'AND notice_id <= ' . $max_id . ' '; } - if (!is_null($since)) { - $qry .= 'AND modified > \'' . date('Y-m-d H:i:s', $since) . '\' '; - } - // NOTE: we sort by fave time, not by notice time! $qry .= 'ORDER BY modified DESC '; |