X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Freplynoticestream.php;h=9fea5cac1e5accdc62a77b65526d468c2ae7d8ea;hb=10f2cde0b1d75fa023b00400162cb525e8719514;hp=43e378c1be2df09bcc0b03a7eb93ca425b5c8ebe;hpb=0cefab3603321b304914c7ee840e64a478ce050c;p=quix0rs-gnu-social.git diff --git a/lib/replynoticestream.php b/lib/replynoticestream.php index 43e378c1be..9fea5cac1e 100644 --- a/lib/replynoticestream.php +++ b/lib/replynoticestream.php @@ -82,17 +82,21 @@ class RawReplyNoticeStream extends NoticeStream function getNoticeIds($offset, $limit, $since_id, $max_id) { $reply = new Reply(); - $reply->profile_id = $this->userId; - Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'modified'); - Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'modified'); + $reply->selectAdd(); + $reply->selectAdd('notice_id'); + + $reply->whereAdd(sprintf('reply.profile_id = %u', $this->userId)); + + Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'reply.modified'); + Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'reply.modified'); if (!empty($this->selectVerbs)) { $reply->joinAdd(array('notice_id', 'notice:id')); $reply->whereAddIn('notice.verb', $this->selectVerbs, 'string'); } - $reply->orderBy('modified DESC, notice_id DESC'); + $reply->orderBy('reply.modified DESC, reply.notice_id DESC'); if (!is_null($offset)) { $reply->limit($offset, $limit);