Changeset 1968 in subversion

Timestamp:

Oct 9, 2008 8:54:21 AM (5 years ago)

Author:

alec

Message:

• set mbstring's internal encoding in proper place

Location:

trunk/roundcubemail/program/include

Files:

• iniset.php (modified) (1 diff)
• main.inc (modified) (1 diff)

trunk/roundcubemail/program/include/iniset.php

@@ -63 +63 @@
 }
 
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+  mb_internal_encoding(RCMAIL_CHARSET);
+              
+
 /**
  * Use PHP5 autoload for dynamic class loading

trunk/roundcubemail/program/include/main.inc

@@ -208 +208 @@
     }
 
-  // settings for mbstring module (by Tadashi Jokagi)
-  if (is_null($mbstring_loaded)) {
-    if ($mbstring_loaded = extension_loaded("mbstring"))
-      mb_internal_encoding(RCMAIL_CHARSET);
-  }
-
+
+  if (is_null($mbstring_loaded))
+    $mbstring_loaded = extension_loaded('mbstring');
+    
   // convert charset using mbstring module
   if ($mbstring_loaded)