From: skodak <skodak>
Date: Thu, 20 Dec 2007 21:17:23 +0000 (+0000)
Subject: MDL-12443 use "UTF-8" label instead of "None" in sitemailcharset select box; merged... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=00ed8abd19da675fb928b4c827cac07cffe18e4c;p=moodle.git

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

diff --git a/admin/settings/server.php b/admin/settings/server.php
index f0bc9f0402..3dc8ba43e2 100644
--- 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));