From 3f9edb4c3ec29b5b807d99da479333b62a406686 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 12:14:38 -0500
Subject: [PATCH] Switched to full UTF-8 support
---
program/include/rcube_shared.inc | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index b622203..a36458b 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -88,13 +88,9 @@
$this->charset = $charset;
}
-
- function encode_string($str)
+ function get_charset()
{
- if ($this->charset=='UTF-8' && function_exists('utf8_encode'))
- return utf8_encode($str);
- else
- return $str;
+ return $this->charset;
}
@@ -187,7 +183,7 @@
// correct absolute pathes in images and other tags
$output = preg_replace('/(src|href|background)=(["\']?)(\/[a-z0-9_\-]+)/Ui', "\\1=\\2$base_path\\3", $output);
- print $output;
+ print rcube_charset_convert($output, 'UTF-8', $this->charset);
}
--
Gitblit v1.9.1