From: stronk7 <stronk7>
Date: Sat, 28 Oct 2006 16:50:28 +0000 (+0000)
Subject: Adding one unmerged change from 17_STABLE. Was breaking some things...
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0163b1d09817a1e27b0630797236d55072fcbe75;p=moodle.git

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

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 1f81589940..8fca9d3d0f 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 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;