MDL-14343 fixed groups_get_user_groups() when groupings disabled; mer…

…ged from MOODLE_19_STABLE
rsendhil · Apr 13, 2008 · ca182d9 · ca182d9
1 parent 90f4745
commit ca182d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/grouplib.php b/lib/grouplib.php
@@ -159,14 +159,14 @@ function groups_get_user_groups($courseid, $userid=0) {
     $allgroups = array();
 
     while ($group = rs_fetch_next_record($rs)) {
+        $allgroups[$group->id] = $group->id;
         if (is_null($group->groupingid)) {
             continue;
         }
         if (!array_key_exists($group->groupingid, $result)) {
             $result[$group->groupingid] = array();
         }
         $result[$group->groupingid][$group->id] = $group->id;
-        $allgroups[$group->id] = $group->id;
     }
     rs_close($rs);
 
@@ -319,7 +319,7 @@ function groups_get_activity_groupmode($cm, $course=null) {
         $course = $COURSE;
     } else {
         if (!$course = get_record('course', 'id', $cm->course)) {
-            print_error('Incorrect course id in cm');
+            error('Incorrect course id in cm');
         }
     }