From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 3 Mar 2012 15:25:42 +0000 (+0900)
Subject: FIX: ロケール周りのバグの修正
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9903d8973e060ab2a7d0657c45cd218b0cefdc1;p=nucleus-jp%2Fnucleus-next.git

FIX: ロケール周りのバグの修正

$DIR_LOCALEは$DIR_LOCALESのtypo。
現在のセッションで使用するロケールの適用バグの修正
不要なLWSの除外。
---

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index d156839..59b0d67 100644
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -17,13 +17,13 @@
  */
 
 /* needed if we include globalfunctions from install.php */
-global $nucleus, $CONF, $DIR_LIBS, $DIR_LOCALE, $manager, $member;
+global $nucleus, $CONF, $DIR_LIBS, $DIR_LOCALES, $manager, $member;
 
 $nucleus['version'] = 'v4.00 SVN';
 $nucleus['codename'] = '';
 
 /* check and die if someone is trying to override internal globals (when register_globals turn on) */
-checkVars(array('nucleus', 'CONF', 'DIR_LIBS', 'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE', '$DIR_LOCALE', 'DIR_PLUGINS', 'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS', 'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS', 'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));
+checkVars(array('nucleus', 'CONF', 'DIR_LIBS', 'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE', '$DIR_LOCALES', 'DIR_PLUGINS', 'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS', 'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS', 'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));
 
 $CONF['debug'] = 0;
 if ( $CONF['debug'] )
@@ -297,7 +297,7 @@ else
 }
 
 /* NOTE: include translation file and set locale */
-if ( $member->isLoggedIn() && !$member->getLocale())
+if ( $member->isLoggedIn() && $member->getLocale())
 {
 	$locale = $member->getLocale();
 }
@@ -445,7 +445,7 @@ if ( $CONF['URLMode'] == 'pathinfo' )
 						$blogid = intval($data[++$i]);
 					}
 					$i++;
-					if ( $i < sizeof($data) ) 
+					if ( $i < sizeof($data) )
 					{
 						$archive = $data[$i];
 					}
@@ -1720,7 +1720,7 @@ function ticketForPlugin()
 		exit('You aren\'t logged in.');
 	}
 	
-	global $manager, $DIR_LIBS, $DIR_LOCALE, $HTTP_GET_VARS, $HTTP_POST_VARS;
+	global $manager, $DIR_LIBS, $DIR_LOCALES, $HTTP_GET_VARS, $HTTP_POST_VARS;
 	
 	/* Check if this feature is needed (ie, if "$manager->checkTicket()" is not included in the script). */
 	if (!($p_translated = serverVar('PATH_TRANSLATED') ) )