GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Replies caused column name collision on joinAdd

This commit is contained in:
Mikael Nordfeldth 2014-07-15 18:54:42 +02:00
parent 55db74291c
commit d6cc13ac33
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/replynoticestream.php
View File

@ -82,7 +82,11 @@ class RawReplyNoticeStream extends NoticeStream
function getNoticeIds($offset, $limit, $since_id, $max_id)
{
$reply = new Reply();
$reply->profile_id = $this->userId;
$reply->selectAdd();
$reply->selectAdd('notice_id');
$reply->whereAdd(sprintf('reply.profile_id = %u', $this->userId));
Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'modified');
Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'modified');
@ -92,7 +96,7 @@ class RawReplyNoticeStream extends NoticeStream
$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);