From: martinlanghoff <martinlanghoff>
Date: Wed, 19 Sep 2007 07:29:43 +0000 (+0000)
Subject: accesslib: get_user_courses_bycap() fix to deal with empty $order
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d4bec858293fd0643f4b7e85c2a57f8d4a847114;p=moodle.git

accesslib: get_user_courses_bycap() fix to deal with empty $order

If we are passed an empty string for $order, still create valid
SQL. Some callers in 1.9 seem to not care about order, passing
an explicit ''. Shocking! ;-)
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index bdb6e3784e..1ecffe5fa9 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -783,6 +783,11 @@ function get_user_courses_bycap($userid, $cap, $ad, $doanything, $sort='c.sortor
     }
     $coursefields = 'c.' .join(',c.', $fields);
 
+    $sort = trim($sort);
+    if ($sort !== '') {
+        $sort = "ORDER BY $sort";
+    }
+
     $sysctx = get_context_instance(CONTEXT_SYSTEM);
     if (has_cap_fad($cap, $sysctx, $ad, $doanything)) {
         //
@@ -798,7 +803,7 @@ function get_user_courses_bycap($userid, $cap, $ad, $doanything, $sort='c.sortor
                   ON c.category=cc.id
                 JOIN {$CFG->prefix}context ctx 
                   ON (c.id=ctx.instanceid AND ctx.contextlevel=".CONTEXT_COURSE.")
-                ORDER BY $sort ";
+                $sort ";
         $rs = get_recordset_sql($sql);
     } else {
         //
@@ -856,7 +861,7 @@ function get_user_courses_bycap($userid, $cap, $ad, $doanything, $sort='c.sortor
                 WHERE    ra.id IS NOT NULL
                       OR rc.id IS NOT NULL
                       $catclause
-                ORDER BY $sort ";
+                $sort ";
         $rs = get_recordset_sql($sql);
     }
     $courses = array();