MDL-42514 groups: Importing groups created unnamed groupings

moodle · Oct 25, 2013 · cb8ba87 · cb8ba87
1 parent 95fcab4
commit cb8ba87
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/group/import.php b/group/import.php
@@ -196,16 +196,16 @@
                     }
 
                     // Add group to grouping
-                    if (isset($newgroup->groupingname)) {
+                    if (!empty($newgroup->groupingname) || is_numeric($newgroup->groupingname)) {
                         $groupingname = $newgroup->groupingname;
                         if (! $groupingid = groups_get_grouping_by_name($newgroup->courseid, $groupingname)) {
                             $data = new stdClass();
                             $data->courseid = $newgroup->courseid;
                             $data->name = $groupingname;
                             if ($groupingid = groups_create_grouping($data)) {
-                                echo $OUTPUT->notification(get_string('groupingaddedsuccesfully', 'group', $groupname), 'notifysuccess');
+                                echo $OUTPUT->notification(get_string('groupingaddedsuccesfully', 'group', $groupingname), 'notifysuccess');
                             } else {
-                                echo $OUTPUT->notification(get_string('groupingnotaddederror', 'error', $groupname));
+                                echo $OUTPUT->notification(get_string('groupingnotaddederror', 'error', $groupingname));
                                 continue;
                             }
                         }