DOn't set CFG->courelang unless it means something

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d1897577a323d0cfa41ebe37e1f1bf0676e8dcb7..bb6ff024282c050dd5a9ea743d3f66287dd8929d 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1633,8 +1633,10 @@ function get_string($identifier, $module="", $a=NULL) {
     global $CFG;
 
     global $course;     /// Not a nice hack, but quick
-    if (!empty($course->lang)) {
-        $CFG->courselang = $course->lang;
+    if (empty($CFG->courselang)) {
+        if (!empty($course->lang)) {
+            $CFG->courselang = $course->lang;
+        }
     }
 
     $lang = current_language();