MDL-7250 Slight change to load_defaultuser_role so that it doesn't load 0s into $USER->capabilities.

This commit is contained in:
sam_marshall
2006-10-27 16:16:35 +00:00
parent eae483c5a4
commit b1d476b800
+2 -1
View File
@@ -130,7 +130,8 @@ function load_defaultuser_role() {
if ($capabilities = get_records_select('role_capabilities',
"roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id")) {
foreach ($capabilities as $capability) {
if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) { // Don't overwrite
if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])
&& $capability->permission != 0) { // Don't overwrite if it's already set, nor store 'inherit'
$USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;
}
}