course/lib:print_course() smarter calling of get_role_users()

And saves a few dbqueries too...

diff --git a/course/lib.php b/course/lib.php
index 6f28aeffa5b317cac44bc8c981b2d6ef4377fd6b..f21afeca6aa6bc465ccb10a7e4fff0957e064ad2 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1812,17 +1812,13 @@ function print_course($course) {
     /// first find all roles that are supposed to be displayed
     if ($managerroles = get_config('', 'coursemanager')) {
         $coursemanagerroles = split(',', $managerroles);
-        $roles = get_records_select( 'role', '', 'sortorder' );
-        foreach ($roles as $role) {
-            if (in_array( $role->id, $coursemanagerroles )) {
-                if ($users = get_role_users($role->id, $context, true, '', 'u.lastname ASC', true)) {
-                    foreach ($users as $teacher) {
-                        $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
-                        $namesarray[] = role_get_name($role, $context).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
-                                    $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>';
-                    }
-                }          
-            }
+        $canseehidden = has_capability('moodle/role:viewhiddenassigns', $context);
+        $rusers = get_role_users($coursemanagerroles, $context, 
+                                 true, '', 'r.sortorder ASC, u.lastname ASC', $canseehidden) ;
+        foreach ($rusers as $teacher) {
+            $fullname = fullname($teacher, has_capability('moodle/site:viewfullnames', $context)); 
+            $namesarray[] = format_string($teacher->rolename).': <a href="'.$CFG->wwwroot.'/user/view.php?id='.
+                $teacher->id.'&amp;course='.SITEID.'">'.$fullname.'</a>'; 
         }
         
         if (!empty($namesarray)) {