Adding one unmerged change from 17_STABLE. Was breaking some things...

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 1f8158994081d545e27f528494757994e08fc39b..8fca9d3d0f27fffb2d95a95c9e73980a17c1ba4a 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -128,7 +128,7 @@ function load_defaultuser_role() {
     }
 
     if ($capabilities = get_records_select('role_capabilities',
-                                     "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id AND capability <> 0")) {
+                                     "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id AND permission <> 0")) {
         foreach ($capabilities as $capability) {
             if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) {  // Don't overwrite
                 $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;