From: sam_marshall <sam_marshall>
Date: Fri, 27 Oct 2006 16:27:28 +0000 (+0000)
Subject: MDL-7250 merged from stable
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=62eb0371dcec5904e57da4ec5c955191dcbadbcf;p=moodle.git

MDL-7250 merged from stable
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0a67da5719..1f81589940 100755
--- 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")) {
+                                     "roleid = $CFG->defaultuserroleid AND contextid = $sitecontext->id AND capability <> 0")) {
         foreach ($capabilities as $capability) {
             if (!isset($USER->capabilities[$sitecontext->id][$capability->capability])) {  // Don't overwrite
                 $USER->capabilities[$sitecontext->id][$capability->capability] = $capability->permission;