MERGE: リビジョン1828。リビジョン1827の補足。

返り値やその評価を整理。

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 3bd396c..e05831d 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -342,7 +342,7 @@ if ( $member->isLoggedIn() )
 }\r
 else\r
 {\r
-       if ( i18n::get_forced_locale() !== '' )\r
+       if ( i18n::get_forced_locale() !== FALSE )\r
        {\r
                $locale = i18n::get_forced_locale();\r
        }\r

diff --git a/nucleus/libs/i18n.php b/nucleus/libs/i18n.php
index 4a3986f..3001826 100644 (file)
--- a/nucleus/libs/i18n.php
+++ b/nucleus/libs/i18n.php
@@ -192,7 +192,7 @@ class i18n
        {\r
                if ( !self::$forced_language )\r
                {\r
-                       return;\r
+                       return '';\r
                }\r
                \r
                $elements = array(self::$forced_language, self::$forced_script, self::$forced_region);\r