From b1d476b800ee53adca742f47ce869733a264e52c Mon Sep 17 00:00:00 2001 From: sam_marshall Date: Fri, 27 Oct 2006 16:16:35 +0000 Subject: [PATCH] MDL-7250 Slight change to load_defaultuser_role so that it doesn't load 0s into $USER->capabilities. --- lib/accesslib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/accesslib.php b/lib/accesslib.php index 0a67da57191..2bb5865dd52 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -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; } }