From 2d9965e1dc114087c003b80d53db04a7e277f4ec Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Tue, 19 Sep 2006 02:47:55 +0000 Subject: [PATCH] function should be looking up parent contexts too --- lib/accesslib.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/accesslib.php b/lib/accesslib.php index 09148ff146..fc5c9e921e 100755 --- a/lib/accesslib.php +++ b/lib/accesslib.php @@ -2214,19 +2214,21 @@ function get_component_string($component, $contextlevel) { } /** gets the list of roles assigned to this context + * and up (parents) * @param object $context * @return array */ function get_roles_used_in_context($context) { global $CFG; - - return get_records_sql('SELECT distinct r.id, r.name, r.shortname - FROM '.$CFG->prefix.'role_assignments ra, - '.$CFG->prefix.'role r + + $contextlist = get_related_contexts_string($context); + return get_records_sql("SELECT distinct r.id, r.name, r.shortname + FROM {$CFG->prefix}role_assignments ra, + {$CFG->prefix}role r WHERE r.id = ra.roleid - AND ra.contextid = '.$context->id.' - ORDER BY r.sortorder ASC'); + AND ra.contextid $contextlist + ORDER BY r.sortorder ASC"); } /** this function is used to print roles column in user profile page. -- 2.39.5