Move the codes including mb_emulator from config.php to globalfunctions.php. Put...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1119 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/config.php b/utf8/config.php
index 28fdecb..797ab2d 100755 (executable)
--- a/utf8/config.php
+++ b/utf8/config.php
@@ -58,7 +58,4 @@ if (!@file_exists($DIR_LIBS . 'globalfunctions.php')) {
 
 // コアライブラリのパースをします
 include($DIR_LIBS.'globalfunctions.php');
-if (!extension_loaded('mbstring')) {
-       include($DIR_LIBS.'mb_emulator/mb-emulator.php');
-}
 ?>
\ No newline at end of file

diff --git a/utf8/config.php.sample b/utf8/config.php.sample
index e12bb1e..ed3db89 100755 (executable)
--- a/utf8/config.php.sample
+++ b/utf8/config.php.sample
@@ -58,7 +58,4 @@ if (!@file_exists($DIR_LIBS . 'globalfunctions.php')) {
 
 // コアライブラリのパースをします
 include($DIR_LIBS.'globalfunctions.php');
-if (!extension_loaded('mbstring')) {
-       include($DIR_LIBS.'mb_emulator/mb-emulator.php');
-}
 ?>
\ No newline at end of file

diff --git a/utf8/install/index.php b/utf8/install/index.php
index a744ce6..da2b65e 100755 (executable)
--- a/utf8/install/index.php
+++ b/utf8/install/index.php
@@ -499,20 +499,9 @@ function doInstall() {
        $config_adminemail = $user_email;\r
        $config_sitename   = $blog_name;\r
        $weblog_ping       = postVar('Weblog_ping');\r
-\r
+       \r
        $_POST = array();\r
-       if (!extension_loaded('mbstring')) {\r
-               include('../nucleus/libs/mb_emulator/mb-emulator.php');\r
-       }\r
-       if ($charset == 'ujis') {\r
-               define('_CHARSET', 'EUC-JP');\r
-               $config_sitename = mb_convert_encoding($config_sitename, _CHARSET, 'UTF-8');\r
-               $user_realname  = mb_convert_encoding($user_realname, _CHARSET, 'UTF-8');\r
-               $blog_name        = mb_convert_encoding($blog_name, _CHARSET, 'UTF-8');\r
-       } else {\r
-               define('_CHARSET', 'UTF-8');\r
-       }\r
-\r
+       \r
        $config_indexurl   = replaceDoubleBackslash($config_indexurl);\r
        $config_adminurl   = replaceDoubleBackslash($config_adminurl);\r
        $config_mediaurl   = replaceDoubleBackslash($config_mediaurl);\r
@@ -523,6 +512,29 @@ function doInstall() {
        $config_skinspath  = replaceDoubleBackslash($config_skinspath);\r
        $config_mediapath  = replaceDoubleBackslash($config_mediapath);\r
 \r
+/**\r
+ * Include and initialize multibyte functions as a replacement for mbstring extension\r
+ *  if mbstring extension is not loaded.\r
+ * Jan.28, 2011. Japanese Package Release Team\r
+ */ \r
+       if (!function_exists('mb_convert_encoding')){\r
+               global $mbemu_internals;\r
+               include_once($config_adminpath.'libs/mb_emulator/mb-emulator.php');\r
+       }\r
+       if (function_exists('date_default_timezone_set')){\r
+                @date_default_timezone_set((function_exists('date_default_timezone_get')) ? @date_default_timezone_get() : 'UTC');\r
+       }\r
+       \r
+       if ($charset == 'ujis') {\r
+               define('_CHARSET', 'EUC-JP');\r
+               $config_sitename = mb_convert_encoding($config_sitename, _CHARSET, 'UTF-8');\r
+               $user_realname  = mb_convert_encoding($user_realname, _CHARSET, 'UTF-8');\r
+               $blog_name        = mb_convert_encoding($blog_name, _CHARSET, 'UTF-8');\r
+       } else {\r
+               define('_CHARSET', 'UTF-8');\r
+       }\r
+       \r
+       \r
        // 1. check all the data\r
        $errors = array();\r
 \r
@@ -863,9 +875,6 @@ function doInstall() {
                $config_data .= "\n";\r
                $config_data .= "   // include libs\n";\r
                $config_data .= "   include(\$DIR_LIBS . 'globalfunctions.php');\n";\r
-               $config_data .= "   if (!extension_loaded('mbstring')) {\n";\r
-               $config_data .= "          include(\$DIR_LIBS . 'mb_emulator/mb-emulator.php');\n";\r
-               $config_data .= "   }\n";\r
                $config_data .= "?" . ">";\r
 \r
                $result = @fputs($fp, $config_data, strlen($config_data) );\r
@@ -929,9 +938,6 @@ function doInstall() {
 \r
        // include libs\r
        include($DIR_LIBS . 'globalfunctions.php');\r
-       if (!extension_loaded('mbstring')) {\r
-               include($DIR_LIBS . 'mb_emulator/mb-emulator.php');\r
-       }\r
 ?&gt;</code></pre>\r
 \r
        <?php echo _TEXT11; ?>\r