summaryrefslogtreecommitdiff
path: root/classes/Reply.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-02 12:21:48 -0800
committerBrion Vibber <brion@pobox.com>2010-03-02 12:21:48 -0800
commit72460091ddc6763cb8d62f9d865390ea4973dd44 (patch)
tree78c13bbd3cc8774ad1bee1c92bfe0982744f8c89 /classes/Reply.php
parente3c2b8e0b50d750ad35cb313726fd2706684c09b (diff)
parentb1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Reply.php')
-rw-r--r--classes/Reply.php10
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)) {