We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit d6cc13ac authored by mattl's avatar mattl

Replies caused column name collision on joinAdd

parent 55db7429
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment