MDL-14566

Misused get_role_users() was not returning users assigned in parent categories

Merged from STABLE_19

diff --git a/enrol/manual/enrol.php b/enrol/manual/enrol.php
index 8436ff321b4c3f5c43a80e0149a3b548fcb57dce..5f31330ee0d4a232ddf9f35eeca03a809265c04f 100644 (file)
--- a/enrol/manual/enrol.php
+++ b/enrol/manual/enrol.php
@@ -391,7 +391,7 @@ function print_enrolmentkeyfrom($course) {
     $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),$canseehidden  )) {
+        if ($contacts = get_role_users($CFG->enrol_manual_keyholderrole, get_context_instance(CONTEXT_COURSE, $course->id),true,'','u.lastname ASC',$canseehidden  )) {
             // guest user has a slightly different message
             if ($guest) {
                 print_string('enrolmentkeyfromguest', '', ':<br />' );