MDL-9324 group assignment does not work in uploaduser script; merged from MOODLE_18_S...

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index a13ebe74d4faae5d904905e19dd28d0e5bd74552..8678eaf0df9e74762cf287a5cc3f581f2ebdf457 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -302,8 +302,8 @@ if ($um->preprocess_files() && confirm_sesskey()) {
                             if (!$course[$i]) {
                                 notify(get_string('coursegroupunknown','error',$addgroup[$i]));
                             } else {
-                                if ($groupid = groups_get_group_by_name($course[$i]->id, $addgroup[$i])) { //TODO:check.
-                                    $groupid[$i] = $groupid;
+                                if ($gid = groups_get_group_by_name($course[$i]->id, $addgroup[$i])) {
+                                    $groupid[$i] = $gid;
                                 } else {
                                     notify(get_string('groupunknown','error',$addgroup[$i]));
                                 }