[Svn] r1968 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Thu Oct 9 14:54:21 CEST 2008


Author: alec
Date: 2008-10-09 07:54:21 -0500 (Thu, 09 Oct 2008)
New Revision: 1968

Modified:
   trunk/roundcubemail/program/include/iniset.php
   trunk/roundcubemail/program/include/main.inc
Log:
- set mbstring's internal encoding in proper place


Modified: trunk/roundcubemail/program/include/iniset.php
===================================================================
--- trunk/roundcubemail/program/include/iniset.php	2008-10-09 11:14:56 UTC (rev 1967)
+++ trunk/roundcubemail/program/include/iniset.php	2008-10-09 12:54:21 UTC (rev 1968)
@@ -62,6 +62,11 @@
   set_time_limit(120);
 }
 
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+  mb_internal_encoding(RCMAIL_CHARSET);
+	      
+
 /**
  * Use PHP5 autoload for dynamic class loading
  * 

Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2008-10-09 11:14:56 UTC (rev 1967)
+++ trunk/roundcubemail/program/include/main.inc	2008-10-09 12:54:21 UTC (rev 1968)
@@ -207,12 +207,10 @@
       }
     }
 
-  // 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)
     {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list