]> git.mjollnir.org Git - moodle.git/commitdiff
accesslib: get_users_by_capability() fix subselect with ra.hidden
authormartinlanghoff <martinlanghoff>
Sun, 6 Jan 2008 23:26:08 +0000 (23:26 +0000)
committermartinlanghoff <martinlanghoff>
Sun, 6 Jan 2008 23:26:08 +0000 (23:26 +0000)
 MDL-12452

lib/accesslib.php

index 1c8529b1584ae01865f04907b37e741735ed300e..2ece09de0abf253e4284c773ac532b116a423d4e 100755 (executable)
@@ -4282,8 +4282,10 @@ function get_users_by_capability($context, $capability, $fields='', $sort='',
     /// Set up hidden role-assignments sql
     if ($view && !has_capability('moodle/role:viewhiddenassigns', $context)) {
         $condhiddenra = 'AND ra.hidden = 0 ';
+        $sscondhiddenra = 'AND ssra.hidden = 0 ';
     } else {
         $condhiddenra = '';
+        $sscondhiddenra = '';
     }
 
     // Collect WHERE conditions
@@ -4354,7 +4356,7 @@ function get_users_by_capability($context, $capability, $fields='', $sort='',
                           FROM {$CFG->prefix}role_assignments ssra
                           WHERE ssra.contextid IN ($ctxids)
                                 AND ssra.roleid IN (".implode(',',$roleids) .")
-                                $condhiddenra
+                                $sscondhiddenra
                           ) ra ON ra.userid = u.id
                     $uljoin ";
         $where  = " WHERE u.deleted = 0 ";