From: moodler <moodler>
Date: Thu, 8 Jan 2004 04:50:43 +0000 (+0000)
Subject: Fix for case calling get_courses("all") when there is no user
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=14f3260978c0a95b223ad8e50a2807fa0106add4;p=moodle.git

Fix for case calling get_courses("all") when there is no user
---

diff --git a/lib/datalib.php b/lib/datalib.php
index 41b234d5dd..06d4011bdb 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1527,7 +1527,7 @@ function get_courses($categoryid="all", $sort="c.sortorder ASC", $fields="c.*")
 
     $categoryselect = "";
     if ($categoryid != "all") {
-        $categoryselect = "WHERE c.category = '$categoryid'";
+        $categoryselect = "c.category = '$categoryid'";
     }
 
     $teachertable = "";
@@ -1541,7 +1541,12 @@ function get_courses($categoryid="all", $sort="c.sortorder ASC", $fields="c.*")
         $visiblecourses = "AND c.visible > 0";
     }
 
-    $selectsql = "{$CFG->prefix}course c $teachertable $categoryselect $visiblecourses";
+    if ($categoryselect or $visiblecourses) {
+        $selectsql = "{$CFG->prefix}course c $teachertable WHERE $categoryselect $visiblecourses";
+    } else {
+        $selectsql = "{$CFG->prefix}course c $teachertable";
+    }
+
 
     return get_records_sql("SELECT DISTINCT $fields FROM $selectsql ORDER BY $sort");
 }