Bug fixes

Removed some dowuery calls in deprecated code.
Updated labels
Updated requirements & types for ore miner

Signed-off-by: Gregory PLANCHAT <g.planchat@gmail.com>
This commit is contained in:
Gregory PLANCHAT 2012-04-09 20:01:45 +02:00
commit b09c4e6c62
22 changed files with 936 additions and 604 deletions

View file

@ -244,7 +244,7 @@ class Wootook
}
$userLocale = Wootook_Player_Model_Session::getSingleton()->getData('locale');
if ($userLocale !== null) {
if ($userLocale !== null && in_array($userLocale, $availableLocales)) {
return $userLocale;
}
@ -270,8 +270,8 @@ class Wootook
return self::getDefaultLocale();
}
$preferredLocale = key($locales);
$preferredPriority = current($locales);
$preferredLocale = current($availableLocales);
$preferredPriority = 0;
foreach ($locales as $locale => $piority) {
if (!in_array($locale, $availableLocales)) {
continue;
@ -281,6 +281,7 @@ class Wootook
$preferredLocale = $locale;
}
}
var_dump($preferredLocale);
Wootook_Player_Model_Session::getSingleton()->setData('locale', $preferredLocale);