Don't overwrite capabilities when loading default role

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 75c823568029d82660481035638ea7df2a4c8386..fb6dda914e0afc651c3e774c9cec17b80bfed8ee 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -121,7 +121,9 @@ function load_defaultuser_role() {
     if ($capabilities = get_records_select('role_capabilities', 
                                      "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id")) {
         foreach ($capabilities as $capability) {
-            $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;     
+            if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) {  // Don't overwrite
+                $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;     
+            }
         }
 
         // SPECIAL EXCEPTION:  If the default user role is actually a guest role, then