Notice killing... ;-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 0042e3bf30021b23286b37d0e237d42b91ed8d6e..f4b808817813a71abe89805b26af32abde57c34d 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3850,7 +3850,7 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml='', $a
 
 /// If we are running under Unicode and sitemailcharset or allowusermailcharset are set, convert the email
 /// encoding to the specified one
-    if ($CFG->unicodedb && (!empty($CFG->sitemailcharset) || !empty($CFG->allowusermailcharset))) {
+    if (!empty($CFG->unicodedb) && (!empty($CFG->sitemailcharset) || !empty($CFG->allowusermailcharset))) {
     /// Set it to site mail charset
         $charset = $CFG->sitemailcharset;
     /// Overwrite it with the user mail charset