Merge branch 'MDL-57564-33-courseorder' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE

2017-12-18 11:25:10 +08:00
parent fb20acf02d 3b70d720ec
commit 1c216b13e4
1 changed files with 8 additions and 2 deletions
@@ -61,9 +61,15 @@ class main implements renderable, templatable {
     * @return stdClass
     */
    public function export_for_template(renderer_base $output) {
-        global $USER;
+        global $CFG, $USER;

-        $courses = enrol_get_my_courses('*', 'fullname ASC');
+        if (empty($CFG->navsortmycoursessort)) {
+            $sort = 'visible DESC, sortorder ASC';
+        } else {
+            $sort = 'visible DESC, '.$CFG->navsortmycoursessort.' ASC';
+        }
+
+        $courses = enrol_get_my_courses('*', $sort);
        $coursesprogress = [];

        foreach ($courses as $course) {