MDL-45068 groups: corrected check for idnumber '0'

moodle · Nov 29, 2017 · 60770d1 · 60770d1
1 parent 108411a
commit 60770d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/group/import.php b/group/import.php
@@ -134,7 +134,7 @@
                 }
             }
 
-            if (!empty($newgroup->idnumber)) {
+            if (isset($newgroup->idnumber) && strlen($newgroup->idnumber)) {
                 //if idnumber is set, we use that.
                 //unset invalid courseid
                 if (!$mycourse = $DB->get_record('course', array('idnumber'=>$newgroup->idnumber))) {
@@ -144,7 +144,7 @@
                     $newgroup->courseid = $mycourse->id;
                 }
 
-            } else if (!empty($newgroup->coursename)) {
+            } else if (isset($newgroup->coursename) && strlen($newgroup->coursename)) {
                 //else use course short name to look up
                 //unset invalid coursename (if no id)
                 if (!$mycourse = $DB->get_record('course', array('shortname' => $newgroup->coursename))) {