[php-blog-cvs] serendipity/include lang.inc.php,1.10,1.11

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16841/include

Modified Files:
	lang.inc.php 
Log Message:
patch #1121207 by Tadashi Jokagi to correctly use mb_Send_mail for japanese


Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lang.inc.php	16 Feb 2005 12:36:19 -0000	1.10
+++ lang.inc.php	17 Feb 2005 11:38:45 -0000	1.11
@@ -22,6 +22,14 @@
 if (!defined('serendipity_MB_LOADED') && defined('serendipity_LANG_LOADED')) {
     // Needs to be included here because we need access to constant LANG_CHARSET definied in languages (not available for compat.inc.php)
 
+    if (function_exists('mb_language')) {
+        @mb_language($serendipity['lang']);
+    }
+    
+    if (function_exists('mb_internal_encoding')) {
+        @mb_internal_encoding(LANG_CHARSET);
+    }
+
     // Multibyte string functions wrapper:
     // strlen(), strpos(), strrpos(), strtolower(), strtoupper(), substr(), ucfirst()
     function serendipity_mb() {
@@ -33,8 +41,6 @@
                 if (function_exists('mb_strtoupper')) {
                     $mbstring = 2;
                 }
-
-                @mb_internal_encoding(LANG_CHARSET);
             }
         }