X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FReply.php;h=659e04c9253934ad82dad90b0cd2ce4d198b32f5;hb=27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad;hp=4439053b444934f05fb69fa9b4d5b396700f532e;hpb=53d6a8ba611716ce47da291bc38695be24212c3d;p=quix0rs-gnu-social.git diff --git a/classes/Reply.php b/classes/Reply.php index 4439053b44..659e04c925 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, $before_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, $before_id, $since); + $offset, $limit, $since_id, $max_id); return $ids; } - function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_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; @@ -40,12 +40,8 @@ class Reply extends Memcached_DataObject $reply->whereAdd('notice_id > ' . $since_id); } - if ($before_id != 0) { - $reply->whereAdd('notice_id < ' . $before_id); - } - - if (!is_null($since)) { - $reply->whereAdd('modified > \'' . date('Y-m-d H:i:s', $since) . '\''); + if ($max_id != 0) { + $reply->whereAdd('notice_id < ' . $max_id); } $reply->orderBy('notice_id DESC');