MDL-13399 prevent ambiguous column names in get_my_courses; merged from MOODLE_19_STABLE

diff --git a/lib/datalib.php b/lib/datalib.php
index 0d245663b7f6fc69a6a683ece93d936e4df01afe..7303a36f5a9f7f0512ec2e5913c588145d4e13de 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -832,6 +832,16 @@ function get_my_courses($userid, $sort='visible DESC,sortorder ASC', $fields=NUL
     $orderby = '';
     $sort    = trim($sort);
     if (!empty($sort)) {
+        $rawsorts = explode(',', $sort);
+        $sorts = array();
+        foreach ($rawsorts as $rawsort) {
+            $rawsort = trim($rawsort);
+            if (strpos('c.', $rawsort)) {
+                $rawsort = substr($rawsort, 2);
+            }
+            $sorts[] = trim($rawsort);
+        }
+        $sort = 'c.'.implode(',c.', $sorts);
         $orderby = "ORDER BY $sort";
     }