Email encoding only can be specified if $CFG->unicodedb=true

diff --git a/admin/configvars.php b/admin/configvars.php
index aa4b8ba85ca8e30062fad23edbd9fb31e6bad460..c6a2541f578ebe5da791ba84214d61707d6250ee 100644 (file)
--- a/admin/configvars.php
+++ b/admin/configvars.php
@@ -570,19 +570,21 @@ class configvarrss extends configvar {
     $mail['denyemailaddresses'] = new configvar (get_string('configdenyemailaddresses', 'admin'),
         '<input name="denyemailaddresses" type="text" size="60" value="'.s($config->denyemailaddresses).'" alt="denyemailaddresses" />' );
 
-/// sitemailcharset
-    unset($options);
-    unset($charsets);
-    $charsets = get_list_of_charsets();
-    $options['0'] = get_string('none');
-    $options = array_merge($options, $charsets);
-    $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
-        choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
-
-/// allowusermailcharset
-    $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
-        choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
-
+    if (!empty($CFG->unicodedb)) { ///These options are only available if running under unicodedb
+    /// sitemailcharset
+        unset($options);
+        unset($charsets);
+        $charsets = get_list_of_charsets();
+        $options['0'] = get_string('none');
+        $options = array_merge($options, $charsets);
+        $mail['sitemailcharset'] = new configvar (get_string('configsitemailcharset', 'admin'),
+            choose_from_menu($options, 'sitemailcharset', $config->sitemailcharset, '', '', '', true));
+
+    /// allowusermailcharset
+        $mail['allowusermailcharset'] = new configvar (get_string('configallowusermailcharset', 'admin'),
+            choose_from_menu($noyesoptions, 'allowusermailcharset', $config->allowusermailcharset, '', '', '', true));
+    }
+    
 /// enable stats
     $stats['enablestats'] = new configvar (get_string('configenablestats','admin'),
         choose_from_menu($noyesoptions, 'enablestats', $config->enablestats, '', '', '', true) );

diff --git a/user/edit.html b/user/edit.html
index 82ce3cc2c5de5907e978a49e182fe78c9ae488af..ae09d06ce07f4ecbdc1a6928e7697cd1fed950a4 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -134,7 +134,7 @@ if (isadmin()) {
     choose_from_menu ($choices, "mailformat", $user->mailformat, "") ?>
     </td>
 </tr>
-<?php if (!empty($CFG->allowusermailcharset)) { ?>
+<?php if (!empty($CFG->unicodedb) && !empty($CFG->allowusermailcharset)) { ?>
 <tr>
     <th><?php print_string("emailcharset") ?>:</th>
     <td><?php

diff --git a/user/edit.php b/user/edit.php
index 7f71b59f82acabfc8cefc018b3b3f68792809478..a450ce565852a1d0dfb6fe788be98a796a24e7a3 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -99,7 +99,7 @@
         
         $usernew->maildisplay   = clean_param($usernew->maildisplay,   PARAM_INT);
         $usernew->mailformat    = clean_param($usernew->mailformat,    PARAM_INT);
-        if ($CFG->allowusermailcharset) {
+        if (!empty($CFG->unicodedb) && $CFG->allowusermailcharset) {
             $usernew->mailcharset = clean_param($usernew->mailcharset, PARAM_CLEAN);
             if (!empty($usernew->mailcharset)) {
                 set_user_preference('mailcharset', $usernew->mailcharset, $user->id);