summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/include/main.inc7
-rw-r--r--program/steps/mail/sendmail.inc5
2 files changed, 10 insertions, 2 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index 936cad388..ddb42181a 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -231,7 +231,7 @@ function get_table_name($table)
// init output object for GUI and add common scripts
function load_gui()
{
- global $CONFIG, $OUTPUT, $COMM_PATH, $JS_OBJECT_NAME, $sess_user_lang;
+ global $CONFIG, $OUTPUT, $COMM_PATH, $JS_OBJECT_NAME, $CHARSET, $sess_user_lang;
// init output page
$OUTPUT = new rcube_html_page();
@@ -248,8 +248,11 @@ function load_gui()
$OUTPUT->include_script('program/js/app.js');
// set user-selected charset
- if ($CONFIG['charset'])
+ if (!empty($CONFIG['charset']))
+ {
$OUTPUT->set_charset($CONFIG['charset']);
+ $CHARSET = $CONFIG['charset'];
+ }
else
rcmail_set_locale($sess_user_lang);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 4531aa311..11fb559dd 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -73,6 +73,11 @@ if (empty($_POST['_to']) && empty($_POST['_subject']) && $_POST['_message'])
}
+// set default charset
+if (empty($CHARSET))
+ $CHARSET = 'ISO-8859-1';
+
+
$mailto_regexp = array('/,\s*[\r\n]+/', '/[\r\n]+/', '/,\s*$/m');
$mailto_replace = array(' ', ', ', '');