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

Commit 618e31a7 authored by mattl's avatar mattl

Further column collisions in ReplyNoticeStream

parent 9a2e3a52
......@@ -88,8 +88,8 @@ class RawReplyNoticeStream extends NoticeStream
$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');
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'));
......@@ -104,11 +104,15 @@ class RawReplyNoticeStream extends NoticeStream
$ids = array();
try {
if ($reply->find()) {
while ($reply->fetch()) {
$ids[] = $reply->notice_id;
}
}
} catch (Exception $e) {
common_debug('MMNDEBUG: '.$e->getMessage().' on '.var_export($reply, true));
}
return $ids;
}
......
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