From: martinlanghoff <martinlanghoff>
Date: Sun, 6 Jan 2008 23:25:51 +0000 (+0000)
Subject: lib/deprecatedlib: use sort_by_roleassignment_authority() to sort RAs
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b1469317a1bbee6590ea507b500dc881f3690e66;p=moodle.git

lib/deprecatedlib: use sort_by_roleassignment_authority() to sort RAs

After calling get_users_by_capability(), use
sort_by_roleassignment_authority() to mimic what older versions of
Moodle did.

Affects: get_teacher(), get_course_teachers()

    MDL-12452
---

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 75cd1e50e6..b723804519 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -518,6 +518,7 @@ function get_teacher($courseid) {
     // Pass $view=true to filter hidden caps if the user cannot see them
     if ($users = get_users_by_capability($context, 'moodle/course:update', 'u.*', 'u.id ASC',
                                          '', '', '', '', false, true)) {
+        $users = sort_by_roleassignment_authority($users, $context);
         return array_shift($users);
     }
 
@@ -743,7 +744,11 @@ function get_course_teachers($courseid, $sort='t.authority ASC', $exceptions='')
         }
     }
 
-    return get_users_by_capability($context, 'moodle/course:update', 'u.*, ul.timeaccess as lastaccess', $sort, '','','',$exceptions, false);
+    $users = get_users_by_capability($context, 'moodle/course:update',
+                                     'u.*, ul.timeaccess as lastaccess',
+                                     $sort, '','','',$exceptions, false);
+    return sort_by_roleassignment_authority($users, $context);
+
     /// some fields will be missing, like authority, editall
     /*
     return get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest,