Merged MDL-13152 from 1.9

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index d47fc282bbc127eb0c73834b37b5a64e19e4cb40..550c1992e680203e4aa7f1a74e29f4c34aa2364e 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -656,8 +656,16 @@ if ($formdata = $mform->is_cancelled()) {
                 // group exists?
                 $addgroup = $user->{'group'.$i};
                 if (!array_key_exists($addgroup, $ccache[$shortname]->groups)) {
-                    $upt->track('enrolments', get_string('unknowgroup', 'error', $addgroup), 'error');
-                    continue;
+                    // if group doesn't exist,  create it
+                    $newgroupdata = new object();
+                    $newgroupdata->name = $addgroup;
+                    $newgroupdata->courseid = $ccache[$shortname]->id;
+                    if ($ccache[$shortname]->groups[$addgroup]->id = groups_create_group($newgroupdata)){
+                        $ccache[$shortname]->groups[$addgroup]->name = $newgroupdata->name;
+                    } else {
+                        $upt->track('enrolments', get_string('unknowngroup', 'error', $addgroup), 'error');
+                        continue;
+                    }
                 }
                 $gid   = $ccache[$shortname]->groups[$addgroup]->id;
                 $gname = $ccache[$shortname]->groups[$addgroup]->name;