Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle

2012-12-11 16:04:31 +13:00
parent 74bf44284a e95bf5b50a
commit 0aed7e7d71
1 changed files with 5 additions and 1 deletions
@@ -900,7 +900,11 @@ if ($formdata = $mform2->is_cancelled()) {
                    $newgroupdata = new stdClass();
                    $newgroupdata->name = $addgroup;
                    $newgroupdata->courseid = $ccache[$shortname]->id;
-                    if ($ccache[$shortname]->groups[$addgroup]->id = groups_create_group($newgroupdata)){
+                    $newgroupdata->description = '';
+                    $gid = groups_create_group($newgroupdata);
+                    if ($gid){
+                        $ccache[$shortname]->groups[$addgroup] = new stdClass();
+                        $ccache[$shortname]->groups[$addgroup]->id   = $gid;
                        $ccache[$shortname]->groups[$addgroup]->name = $newgroupdata->name;
                    } else {
                        $upt->track('enrolments', get_string('unknowngroup', 'error', s($addgroup)), 'error');