From 9034148e0d1fdab17b210ebaf3f0d92693429637 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 9 Jul 2012 09:45:53 -0400 Subject: [PATCH] Squashed commit of the following: commit f4503f30226fee59160600b5c9b81afc6b610a9d Merge: 75f3b4e f10e48c Author: Evan Prodromou Date: Mon Jul 9 09:45:10 2012 -0400 Merge commit 'refs/merge-requests/194' of git://gitorious.org/statusnet/mainline into merge-requests/194 commit f10e48c361d91ab02efc5577254e1dad3b1dcebe Author: Mikael Nordfeldth Date: Thu Jul 5 14:28:30 2012 +0200 multiGet returns a correct Notice object for the fetchAll in NoticeList --- plugins/QnA/actions/qnashowquestion.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/QnA/actions/qnashowquestion.php b/plugins/QnA/actions/qnashowquestion.php index edea032b38..ca2cb74ba1 100644 --- a/plugins/QnA/actions/qnashowquestion.php +++ b/plugins/QnA/actions/qnashowquestion.php @@ -115,13 +115,7 @@ class QnashowquestionAction extends ShownoticeAction } if (count($answerIds) > 0) { - $notice = new Notice(); - $notice->query( - sprintf( - 'SELECT notice.* FROM notice WHERE notice.id IN (%s)', - implode(',', $answerIds) - ) - ); + $notice = Notice::multiGet('id', $answerIds); $nli = new NoticeList($notice, $this); $nli->show();