MDL-8639 fixed installation notices

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 9b5d93fba54cc8588ef6a5fff026cda1df097447..5d28fcd40fe8b8bfbc94d3005209f366d3ca4598 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -4086,7 +4086,7 @@ function clean_filename($string) {
 function current_language() {
     global $CFG, $USER, $SESSION, $COURSE;
 
-    if ($COURSE->id != SITEID and !empty($COURSE->lang)) {    // Course language can override all other settings for this page
+    if (!empty($COURSE->id) and $COURSE->id != SITEID and !empty($COURSE->lang)) {    // Course language can override all other settings for this page
         $return = $COURSE->lang;
 
     } else if (!empty($SESSION->lang)) {    // Session language can override other settings