MDL-13303 fixing missing group icons in forum; merged from MOODLE_19_STABLE

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index a00b5a44baa8789a9dfd527afa93fb5aa8572e33..0153f54354e259bcc899472ae4bedb7e9593f1f2 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4313,12 +4313,12 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode,
     }
 
     // preload all groups of ppl that posted in this discussion
-    if ($postersgroups = groups_get_all_groups($course->id, $posters, $cm->groupingid, 'g.id, gm.userid')) {
+    if ($postersgroups = groups_get_all_groups($course->id, $posters, $cm->groupingid, 'gm.id, gm.groupid, gm.userid')) {
         foreach($postersgroups as $pg) {
             if (!isset($cm->cache->usersgroups[$pg->userid])) {
                 $cm->cache->usersgroups[$pg->userid] = array();
             }
-            $cm->cache->usersgroups[$pg->userid][$pg->id] = $pg->id;
+            $cm->cache->usersgroups[$pg->userid][$pg->groupid] = $pg->groupid;
         }
         unset($postersgroups);
     }