From: moodler <moodler>
Date: Sun, 15 Feb 2004 14:33:13 +0000 (+0000)
Subject: Bug fix for languages in emails and possibly elsewhere that could
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e5415d580a379781fdb871e98077b029a5425275;p=moodle.git

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 1b04f1afb2..d1897577a3 100644
--- 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 {