Merge branch 'MDL-65654-37' of https://github.com/danielneis/moodle i…

…nto MOODLE_37_STABLE
moodle · May 23, 2019 · 65d4f09 · 65d4f09
2 parents cb69e26 + 6956754
commit 65d4f09
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/admin/tool/uploaduser/locallib.php b/admin/tool/uploaduser/locallib.php
@@ -360,6 +360,7 @@ function uu_allowed_roles() {
  */
 function uu_allowed_roles_cache() {
     $allowedroles = get_assignable_roles(context_course::instance(SITEID), ROLENAME_SHORT);
+    $rolecache = [];
     foreach ($allowedroles as $rid=>$rname) {
         $rolecache[$rid] = new stdClass();
         $rolecache[$rid]->id   = $rid;
@@ -379,6 +380,7 @@ function uu_allowed_roles_cache() {
  */
 function uu_allowed_sysroles_cache() {
     $allowedroles = get_assignable_roles(context_system::instance(), ROLENAME_SHORT);
+    $rolecache = [];
     foreach ($allowedroles as $rid => $rname) {
         $rolecache[$rid] = new stdClass();
         $rolecache[$rid]->id   = $rid;