MERGE: リビジョン1681をマージ

FIX: complete lower compatibility related to $DIR_LANG
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1681

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index dcbaa49..27c9ffe 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -42,8 +42,11 @@ else
  */
 if ( !isset($DIR_LOCALES) )
 {
-       global $DIR_LANG;
        $DIR_LOCALES = $DIR_NUCLEUS . 'locales/';
+}
+global $DIR_LANG;
+if ( !isset($DIR_LANG) )
+{
        $DIR_LANG = $DIR_LOCALES;
 }