From afe413989b97b53c36e22775e5cbc4d3b5a009cc Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 9 Apr 2007 11:11:31 +0000 Subject: [PATCH] MDL-9216 has capabilitiy does not respect doanything if admin userid specified and $USER is not admin; merged from MOODLE_18_STABLE --- lib/accesslib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/accesslib.php b/lib/accesslib.php index 484c08e2f0..26b063731e 100755 --- 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 =""; } -- 2.39.5