From ecb9fb058da8d0f5a8e59402c1c1ced21122cbc5 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Mon, 22 Jun 2009 12:20:34 -0400 Subject: [PATCH] - use RCMAIL_CHARSET instead of hardcoded 'utf-8' --- program/include/rcube_html_page.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php index 446efa5..6a19703 100644 --- a/program/include/rcube_html_page.php +++ b/program/include/rcube_html_page.php @@ -29,7 +29,7 @@ protected $scripts_path = ''; protected $script_files = array(); protected $scripts = array(); - protected $charset = 'UTF-8'; + protected $charset = RCMAIL_CHARSET; protected $script_tag_file = "<script type=\"text/javascript\" src=\"%s\"></script>\n"; protected $script_tag = "<script type=\"text/javascript\">\n/* <![CDATA[ */\n%s\n/* ]]> */\n</script>"; @@ -253,7 +253,10 @@ $output = preg_replace_callback('!(src|href)=(["\']?)([a-z0-9/_.-]+.(css|js))(["\'\s>])!i', array($this, 'add_filemtime'), $output); $output = str_replace('$__skin_path', $base_path, $output); - echo rcube_charset_convert($output, 'UTF-8', $this->charset); + if ($this->charset != RCMAIL_CHARSET) + echo rcube_charset_convert($output, RCMAIL_CHARSET, $this->charset); + else + echo $output; } /** -- Gitblit v1.9.1