From: martinlanghoff <martinlanghoff>
Date: Sun, 6 Jan 2008 23:26:08 +0000 (+0000)
Subject: accesslib: get_users_by_capability() fix subselect with ra.hidden
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=92c879cef1314e100bf59544b22dfbe3e7e70512;p=moodle.git

accesslib: get_users_by_capability() fix subselect with ra.hidden

 MDL-12452
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 1c8529b158..2ece09de0a 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -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 ";