Merged 1.8 fix for groups in choice activity

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 75a4d5cd6588c8dd1b156c6312095c01eb40b988..ee922a23702e397d9fdca07c1438174e48ba2d20 100644 (file)
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -317,7 +317,12 @@ function choice_show_results($choice, $course, $cm, $forcepublish='') {
     }
 
     $groupmode = groupmode($course, $cm);
-    $currentgroup = get_current_group($course->id);
+
+    if ($groupmode > 0) {
+        $currentgroup = get_current_group($course->id);
+    } else {
+        $currentgroup = 0;
+    }
 
     $users = get_users_by_capability($context, 'mod/choice:choose', 'u.id, u.picture, u.firstname, u.lastname, u.idnumber', 'u.firstname ASC', '', '', $currentgroup, '', false);