]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Squashed commit of the following:
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:45:53 +0000 (09:45 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:46:27 +0000 (09:46 -0400)
commit f4503f30226fee59160600b5c9b81afc6b610a9d
Merge: 75f3b4e f10e48c
Author: Evan Prodromou <evan@status.net>
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 <mmn@hethane.se>
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

index edea032b388486c98d0e689b5d003ac226ef2d17..ca2cb74ba1d751c2279b4c5db7007a39f154b02d 100644 (file)
@@ -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();