summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-06-22 16:20:34 +0000
committeralecpl <alec@alec.pl>2009-06-22 16:20:34 +0000
commitecb9fb058da8d0f5a8e59402c1c1ced21122cbc5 (patch)
tree9a8a3fb2aa33ffdae6616b73cbecc34cd9a19dbc /program/include
parent11b80e9e33e84c90852a46a5be6d5ff414b37661 (diff)
- use RCMAIL_CHARSET instead of hardcoded 'utf-8'
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_html_page.php7
-rw-r--r--program/include/rcube_imap.php2
-rw-r--r--program/include/rcube_json_output.php2
3 files changed, 7 insertions, 4 deletions
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 446efa5b8..6a197036b 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -29,7 +29,7 @@ class rcube_html_page
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 @@ class rcube_html_page
$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;
}
/**
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 7905894e1..28156a12d 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2690,7 +2690,7 @@ class rcube_imap
/**
- * Convert body charset to UTF-8 according to the ctype_parameters
+ * Convert body charset to RCMAIL_CHARSET according to the ctype_parameters
*
* @param string Part body to decode
* @param string Charset to convert from
diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index cedc6bf6c..7bfca0a6d 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -29,7 +29,7 @@
class rcube_json_output
{
private $config;
- private $charset = 'UTF-8';
+ private $charset = RCMAIL_CHARSET;
private $env = array();
private $texts = array();
private $commands = array();