From 8f85e3759c4eb4b61e8aab2dd4071e429deb81a3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Jan 2010 06:11:06 -0500
Subject: [PATCH] - jQuery-1.4.1
---
program/include/rcube_html_page.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_html_page.php b/program/include/rcube_html_page.php
index 446efa5..36b56e0 100644
--- a/program/include/rcube_html_page.php
+++ b/program/include/rcube_html_page.php
@@ -15,7 +15,7 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: $
+ $Id$
*/
@@ -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