From ee2187273fea18c22270f9e2c37957bb3733a362 Mon Sep 17 00:00:00 2001
From: Daniel Thee Roperto <daniel@theeroperto.com>
Date: Wed, 22 Nov 2017 16:13:03 +1100
Subject: [PATCH] MDL-57564 enrol: Change the default sort in
 enrol_get_my_courses()

The new default value (null) now respects the navsortmycoursessort
behaviour and should be consistently used whenever we are displaying the
courses in the UI.
---
 lib/enrollib.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/enrollib.php b/lib/enrollib.php
index d69094bdd3378..aa50c1de5378b 100644
--- a/lib/enrollib.php
+++ b/lib/enrollib.php
@@ -554,15 +554,23 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) {
  * password).
  *
  * @param string|array $fields
- * @param string $sort
+ * @param string|null $sort
  * @param int $limit max number of courses
  * @param array $courseids the list of course ids to filter by
  * @param bool $allaccessible Include courses user is not enrolled in, but can access
  * @return array
  */
-function enrol_get_my_courses($fields = null, $sort = 'visible DESC,sortorder ASC',
+function enrol_get_my_courses($fields = null, $sort = null,
           $limit = 0, $courseids = [], $allaccessible = false) {
-    global $DB, $USER, $CFG;
+    global $CFG, $DB, $USER;
+
+    if (is_null($sort)) {
+        if (empty($CFG->navsortmycoursessort)) {
+            $sort = 'visible DESC, sortorder ASC';
+        } else {
+            $sort = 'visible DESC, '.$CFG->navsortmycoursessort.' ASC';
+        }
+    }
 
     // Guest account does not have any enrolled courses.
     if (!$allaccessible && (isguestuser() or !isloggedin())) {