From 618e31a780027bf34a4d88762d7cf693148adcec Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 16 Jul 2014 13:02:55 +0200 Subject: [PATCH] Further column collisions in ReplyNoticeStream --- lib/replynoticestream.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/replynoticestream.php b/lib/replynoticestream.php index 2c66fb3b3c..9373854f17 100644 --- a/lib/replynoticestream.php +++ b/lib/replynoticestream.php @@ -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; }