FIxed some problems when getting teacher lists for print_course

diff --git a/course/lib.php b/course/lib.php
index 26ff55f7ab739f5652c737542f81a6b7af55904d..6158e76ede952a49df4df749c5d630bc7e33bb23 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1535,7 +1535,7 @@ function print_course($course, $width="100%") {
 
     if ($teachers = get_users_by_capability($context, 'moodle/course:update', 
                                             'u.*, ul.timeaccess as lastaccess, ra.hidden', 
-                                            $sort, '','','',$exceptions, false)) {
+                                            'r.sortorder ASC', '','','','', false)) {
         $canseehidden = has_capability('moodle/role:viewhiddenassigns', $context);
         $namesarray = array();
         foreach ($teachers as $teacher) {

diff --git a/lib/accesslib.php b/lib/accesslib.php
index b766e6641d03d3cc3f1f5ff9f8b99a8e16d86e89..652c53e704bb9b24933d82b7ef6070cad75f6797 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2654,6 +2654,7 @@ function get_users_by_capability($context, $capability, $fields='', $sort='',
     $select = " SELECT $fields";
     $from   = " FROM {$CFG->prefix}user u
                 INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
+                INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid
                 LEFT OUTER JOIN {$CFG->prefix}user_lastaccess ul ON ul.userid = u.id
                 $groupjoin";
     $where  = " WHERE ra.contextid ".get_related_contexts_string($context)."