OSDN Git Service

Fix Revision 1119, related to mb_emurator loading.
authorsakamocchi <sakamocchi@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Sun, 30 Jan 2011 17:44:43 +0000 (17:44 +0000)
committersakamocchi <sakamocchi@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Sun, 30 Jan 2011 17:44:43 +0000 (17:44 +0000)
git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1125 1ca29b6e-896d-4ea0-84a5-967f57386b96

utf8/nucleus/libs/globalfunctions.php

index 4d3c967..3d2c3b1 100755 (executable)
@@ -98,6 +98,15 @@ if (!isset($CONF['installscript'])) {
        $CONF['installscript'] = 0;\r
 }\r
 \r
+/*\r
+ * Include multibyte function if some functions related to  mbstring are not loaded.\r
+ * By Japanese Packaging Team, Jan.31, 2011\r
+ */\r
+if (!function_exists('mb_convert_encoding')){\r
+       global $mbemu_internals;\r
+       include_once($DIR_LIBS.'mb_emulator/mb-emulator.php');\r
+}\r
+\r
 // we will use postVar, getVar, ... methods instead of HTTP_GET_VARS or _GET\r
 if ($CONF['installscript'] != 1) { // vars were already included in install.php\r
        if (phpversion() >= '4.1.0') {\r
@@ -2053,14 +2062,7 @@ function ticketForPlugin(){
                        include($DIR_LANG . preg_replace('#[\\\\|/]#', '', $language) . '.php');\r
                        include($DIR_LIBS . 'PLUGINADMIN.php');\r
                }\r
-               if (!(function_exists('mb_strimwidth') || extension_loaded('mbstring')))\r
-               {\r
-                       if (file_exists($DIR_LIBS.'mb_emulator/mb-emulator.php'))\r
-                       {\r
-                               global $mbemu_internals;\r
-                               include_once($DIR_LIBS.'mb_emulator/mb-emulator.php');\r
-                       }\r
-               }\r
+               \r
                $oPluginAdmin = new PluginAdmin($plugin_name);\r
                $oPluginAdmin->start();\r
                echo '<p>' . _ERROR_BADTICKET . "</p>\n";\r