Merge branch 'MDL-54035_master-fix' of git://github.com/dmonllao/moodle

moodle · Sep 26, 2018 · d6b71d7 · d6b71d7
2 parents 659d9fe + e8ce6ca
commit d6b71d7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/accesslib.php b/lib/accesslib.php
@@ -1019,7 +1019,9 @@ function reload_all_capabilities() {
     foreach ($sw as $path => $roleid) {
         if ($record = $DB->get_record('context', array('path'=>$path))) {
             $context = context::instance_by_id($record->id);
-            role_switch($roleid, $context);
+            if (has_capability('moodle/role:switchroles', $context)) {
+                role_switch($roleid, $context);
+            }
         }
     }
 }