manage roles: MDL-8313 fix bugs with safe overrides.

diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index 90cd39f5347ed3eebc90a544c61f40bae9929c70..03ba3967296511926f35335bd3e799fe9d4fa5d8 100644 (file)
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -818,7 +818,7 @@ class override_permissions_table_advanced extends capability_table_with_risks {
     /// Determine which capabilities should be locked.
         if ($safeoverridesonly) {
             foreach ($this->capabilities as $capid => $cap) {
-                if (!is_safe_capability($capability)) {
+                if (!is_safe_capability($cap)) {
                     $this->capabilities[$capid]->locked = true;
                     $this->haslockedcapabiltites = true;
                 }

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 1a89cfac15c9de4d761dc828d10f0430541182d0..637721b4419ef77b7fc6deaf83a0681af3f8a334 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -98,8 +98,8 @@
 
 /// Make sure this user can override that role
     if ($roleid && !isset($overridableroles[$roleid])) {
-        $a = stdClass;
-        $a->role = $roleid;
+        $a = new stdClass;
+        $a->roleid = $roleid;
         $a->context = $contextname;
         print_error('cannotoverriderolehere', '', get_context_url($context), $a);
     }

diff --git a/lib/accesslib.php b/lib/accesslib.php
index ea9d07a634d10db69967b484a82551809f7dd41c..f6a70d06188fcf3ea531196c2d42e69ea630335e 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -1954,10 +1954,9 @@ function is_legacy($capabilityname) {
  *      safeoverrides capability should be allowed to change it.
  */
 function is_safe_capability($capability) {
-    return (RISK_DATALOSS | RISK_MANAGETRUST | RISK_CONFIG | RISK_XSS | RISK_PERSONAL) & $capability->riskbitmask;
+    return !((RISK_DATALOSS | RISK_MANAGETRUST | RISK_CONFIG | RISK_XSS | RISK_PERSONAL) & $capability->riskbitmask);
 }
 
-
 /**********************************
  * Context Manipulation functions *
  **********************************/