MDL-12443 use "UTF-8" label instead of "None" in sitemailcharset select box; merged...

diff --git a/admin/settings/server.php b/admin/settings/server.php
index f0bc9f0402e70a4ed91f0dc8e1a00275ec4a39bd..3dc8ba43e2c2e7620bb4e635ea28d73ed74ecca0 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -51,7 +51,7 @@ $temp->add(new admin_setting_configselect('digestmailtime', get_string('digestma
 $charsets = get_list_of_charsets();
 unset($charsets['UTF-8']); // not needed here
 $options = array();
-$options['0'] = get_string('none');
+$options['0'] = 'UTF-8';
 $options = array_merge($options, $charsets);
 $temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '0', $options));
 $temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));