fix HotPot reports for groups (MDL-8944)

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index 13883d84650ed0d8936fa7ec00cbcf79bac8a34a..53871214e0c7fdee090adc0c3bc70c7e1d8cd0b9 100644 (file)
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -83,12 +83,13 @@
 
     // check for groups
     if (preg_match('/^group(\d*)$/', $formdata['reportusers'], $matches)) {
+        $formdata['reportusers'] = 'group';
+        $formdata['reportgroupid'] = 0;
         // validate groupid
-        if (is_numeric($matches[1]) && get_field('groups', 'courseid', 'id', $matches[1])===$course->id) {
-            $formdata['reportusers'] = 'group';
-            $formdata['reportgroupid'] = $matches[1];
-        } else {
-            $formdata['reportgroupid'] = 0; // groupid is invalid
+        if ($groups = groups_get_groups_names($course->id)) {
+            if (isset($groups[$matches[1]])) {
+                $formdata['reportgroupid'] = $matches[1];
+            }
         }
     }