moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

accesslib: get_users_by_capability() fix subselect with ra.hidden

Browse source 
MDL-12452
This commit is contained in:
martinlanghoff 2008-01-06 23:26:08 +00:00
parent b1469317a1
commit 92c879cef1
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/accesslib.php
View file

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