From: moodler <moodler>
Date: Wed, 28 Apr 2004 15:02:14 +0000 (+0000)
Subject: SMall fix to make new cached encoding work with course languages
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e226c03b7e225407e462c15a947707b0ee76a914;p=moodle.git

SMall fix to make new cached encoding work with course languages
---

diff --git a/lib/weblib.php b/lib/weblib.php
index f240f25e16..952cc50af5 100644
--- 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");