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

Further column collisions in ReplyNoticeStream

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-07-16 13:02:55 +02:00
parent 9a2e3a52c9
commit 618e31a780
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

@ -88,8 +88,8 @@ class RawReplyNoticeStream extends NoticeStream
$reply->whereAdd(sprintf('reply.profile_id = %u', $this->userId)); $reply->whereAdd(sprintf('reply.profile_id = %u', $this->userId));
Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'modified'); Notice::addWhereSinceId($reply, $since_id, 'notice_id', 'reply.modified');
Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'modified'); Notice::addWhereMaxId($reply, $max_id, 'notice_id', 'reply.modified');
if (!empty($this->selectVerbs)) { if (!empty($this->selectVerbs)) {
$reply->joinAdd(array('notice_id', 'notice:id')); $reply->joinAdd(array('notice_id', 'notice:id'));
@ -104,11 +104,15 @@ class RawReplyNoticeStream extends NoticeStream
$ids = array(); $ids = array();
try {
if ($reply->find()) { if ($reply->find()) {
while ($reply->fetch()) { while ($reply->fetch()) {
$ids[] = $reply->notice_id; $ids[] = $reply->notice_id;
} }
} }
} catch (Exception $e) {
common_debug('MMNDEBUG: '.$e->getMessage().' on '.var_export($reply, true));
}
return $ids; return $ids;
} }