Merged changes from stable (notice fix)

diff --git a/lib/datalib.php b/lib/datalib.php
index 39e0dcf196a2144222b94ac7e6a78a1323456b9a..be01b7a9cf79784080ccfbf27b8cddbff400686b 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -2074,7 +2074,7 @@ function get_courses_page($categoryid="all", $sort="c.sortorder ASC", $fields="c
     if (!empty($categoryselect)) {
         $sqland = "AND ";
     }
-    if (!empty($USER)) {  // May need to check they are a teacher
+    if (!empty($USER) and !empty($USER->id)) {  // May need to check they are a teacher
         if (!iscreator()) {
             $visiblecourses = "$sqland ((c.visible > 0) OR t.userid = '$USER->id')";
             $teachertable = "LEFT JOIN {$CFG->prefix}user_teachers t ON t.course=c.id";