From 31abd72c2fa13e53a4d8070513cd0a313d2e5925 Mon Sep 17 00:00:00 2001
From: roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 19 Feb 2006 18:34:34 +0000
Subject: Applied several patches

git-svn-id: https://svn.roundcube.net/trunk@140 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_shared.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include/rcube_shared.inc')

diff --git a/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index fb200de57..79428fa16 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -85,7 +85,15 @@ class rcube_html_page
 
   function set_charset($charset)
     {
+    global $MBSTRING;
     $this->charset = $charset;
+    if ($MBSTRING&&function_exists( "mb_internal_encoding"))
+      {
+      if(!@mb_internal_encoding( $charset))
+        {
+        $MBSTRING = FALSE;
+        }
+      }
     }
     
   function get_charset()
@@ -1386,4 +1394,4 @@ function get_offset_time($offset_str, $factor=1)
   }
 
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3