Bug fix for languages in emails and possibly elsewhere that could

happen with blank variables.

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 1b04f1afb2d8da5b9ee71947efcd5fcf2f75fccc..d1897577a323d0cfa41ebe37e1f1bf0676e8dcb7 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1602,13 +1602,13 @@ function current_language() {
 /// Returns the code for the current language
     global $CFG, $USER, $SESSION;
 
-    if (isset($CFG->courselang)) {    // Course language can override all other settings for this page
+    if (!empty($CFG->courselang)) {    // Course language can override all other settings for this page
         return $CFG->courselang;
 
-    } else if (isset($SESSION->lang)) {    // Session language can override other settings
+    } else if (!empty($SESSION->lang)) {    // Session language can override other settings
         return $SESSION->lang;
 
-    } else if (isset($USER->lang)) {    // User language can override site language
+    } else if (!empty($USER->lang)) {    // User language can override site language
         return $USER->lang;
 
     } else {