SMall fix to make new cached encoding work with course languages

diff --git a/lib/weblib.php b/lib/weblib.php
index f240f25e168cca4a808e1de6567eadd77911b715..952cc50af5d79fee11d79c8ba9feb7e203fae7b6 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -933,7 +933,7 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta=
 
     if (!empty($CFG->unicode)) {
         $encoding = "utf-8";
-    } else if (!empty($SESSION->encoding)) {
+    } else if (!empty($SESSION->encoding) and empty($CFG->courselang)) {
         $encoding = $SESSION->encoding;
     } else {
         $encoding = get_string("thischarset");