MDL-9216 has capabilitiy does not respect doanything if admin userid specified and...

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 484c08e2f067c7bd66b16f378590d803c657baa8..26b063731eb0a2ebe12455842f56593d196102ef 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -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 ="";
     }