MDL-9216 has capabilitiy does not respect doanything if admin userid specified and $USER is not admin; merged from MOODLE_18_STABLE

2007-04-09 11:11:31 +00:00
parent 84a13375f0
commit afe413989b
1 changed files with 2 additions and 1 deletions
@@ -845,7 +845,8 @@ function load_user_capability($capability='', $context = NULL, $userid='') {
    }

    if ($capability) {
-        $capsearch = " AND rc.capability = '$capability' ";
+        // the doanything may override the requested capability
+        $capsearch = " AND (rc.capability = '$capability' OR rc.capability = 'moodle/site:doanything') ";
    } else {
        $capsearch ="";
    }