get_role_users() callers rework to use the new $gethidden

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 417d878b99f965c02e7ce3df7310d1317e138d1e..aa62e9e0d7499e4e254bfc2ac11996e6a2f44d28 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -281,7 +281,7 @@
     /// Get all existing participants in this context.
         // Why is this not done with get_users???
 
-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, r.hidden')) {
+        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, ra.hidden')) {
             $contextusers = array();
         }
 

diff --git a/course/info.php b/course/info.php
index 267d9dc3555e0bd713b63b6bca371a5dd022ad25..1abdda729e7d74bc6874c5ff46cd79c7e099d0de 100644 (file)
--- a/course/info.php
+++ b/course/info.php
@@ -55,7 +55,8 @@
         $coursemanagerroles = split(',', $managerroles);
         foreach ($coursemanagerroles as $roleid) {
             $role = get_record('role','id',$roleid);
-            if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', true)) {
+            $canseehidden = has_capability('moodle/role:viewhiddenassigns', $context);
+            if ($users = get_role_users($roleid, $context, true, '', 'u.lastname ASC', $canseehidden)) {
                 foreach ($users as $teacher) {
                     $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
                     $namesarray[] = format_string($role->name).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index db8964f8880c8b71bf586071cef593aa95205be2..ea3d09b16688ce9269e91aeddd9411388675c950 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -368,8 +368,9 @@ function print_enrolmentkeyfrom($course) {
 
     // if a keyholder role is defined we list teachers in that role (if any exist)
     $contactslisted = false;
+    $canseehidden = has_capability('moodle/role:viewhiddenassigns', $context);
     if (!empty($CFG->enrol_manual_keyholderrole)) {
-        if ($contacts = get_role_users($CFG->enrol_manual_keyholderrole, get_context_instance(CONTEXT_COURSE, $course->id), true )) {
+        if ($contacts = get_role_users($CFG->enrol_manual_keyholderrole, get_context_instance(CONTEXT_COURSE, $course->id),$canseehidden  )) {
             // guest user has a slightly different message
             if ($guest) {
                 print_string('enrolmentkeyfromguest', '', ':<br />' );

diff --git a/group/assign.php b/group/assign.php
index 75b7fe0c6f352685e21fdff7366c8e5759b4db76..9cfff8dacd6986d045f061e19312de4b3eb76400 100644 (file)
--- a/group/assign.php
+++ b/group/assign.php
@@ -78,7 +78,8 @@ if ($currentmembers) {
         $coursemanagerroles = split(',', $managerroles);
         foreach ($coursemanagerroles as $roleid) {
             $role = get_record('role','id',$roleid);
-            $managers = get_role_users($roleid, $context, true, 'u.id', 'u.id ASC', true);
+            $canseehidden = has_capability('moodle/role:viewhiddenassigns', $context);
+            $managers = get_role_users($roleid, $context, true, 'u.id', 'u.id ASC', $canseehidden);
         }
     }