user/index: More consistent handling of groups column - MDL-12311

diff --git a/user/index.php b/user/index.php
index 43f2aeda2ab1276c422fbbd23202817eb0942651..58b1a3fe44216d3a446b4620b99abaff2c39d6ec 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -306,11 +306,13 @@
     if ($showenroldata) {
         $tablecolumns[] = 'roles';
         $tableheaders[] = get_string('roles');
-        $tablecolumns[] = 'groups';
-        $tableheaders[] = get_string('groups');
-        if (!empty($CFG->enablegroupings)) {
-            $tablecolumns[] = 'groupings';
-            $tableheaders[] = get_string('groupings', 'group');
+        if ($groupmode != 0) {
+            $tablecolumns[] = 'groups';
+            $tableheaders[] = get_string('groups');
+            if (!empty($CFG->enablegroupings)) {
+                $tablecolumns[] = 'groupings';
+                $tableheaders[] = get_string('groupings', 'group');
+            }
         }
     }
 
@@ -706,14 +708,13 @@
                         }
                     }
                     $data[] = $rastring; 
-                    if ($course->groupmode != 0) {
+                    if ($groupmode != 0) {
                         // htmlescape with s() and implode the array
                         $data[] = implode(', ', array_map('s',$userlist_extra[$user->id]['group']));
+                        if (!empty($CFG->enablegroupings)) {
+                            $data[] = implode(', ', array_map('s', $userlist_extra[$user->id]['gping']));
+                        }
                     }
-                    if (!empty($CFG->enablegroupings)) {
-                        $data[] = implode(', ', array_map('s', $userlist_extra[$user->id]['gping']));
-                    }
-
                 }
 
                 if ($bulkoperations) {