MDL-13399 prevent ambiguous column names in get_my_courses

moodle · Feb 18, 2008 · 8905e7b · 8905e7b
1 parent b28a21b
commit 8905e7b
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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";
     }