summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-01-23 23:58:53 -0800
committerTim Almdal <tnalmdal@shaw.ca>2010-01-23 23:58:53 -0800
commit3b16d0662b8a4b06f4be72165c858a1231e9bd67 (patch)
tree7c673ea68f1f970e9c464841e408079ec2387b79
parent3b8636e5298f61eee3d9953468ef648c36e64e5c (diff)
parentc9b775c21abdf157b635ee023100f25488b89a03 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
-rw-r--r--modules/gallery/helpers/locales.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index 8d76e333..5c8c227a 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -41,7 +41,7 @@ class locales_Core {
$default = module::get_var("gallery", "default_locale");
$codes = explode("|", module::get_var("gallery", "installed_locales", $default));
foreach ($codes as $code) {
- if (isset($available->$code)) {
+ if (isset($available[$code])) {
$installed[$code] = $available[$code];
}
}
@@ -127,7 +127,7 @@ class locales_Core {
}
$locale or $locale = Gallery_I18n::instance()->locale();
- return self::$locales["$locale"];
+ return self::$locales[$locale];
}
static function is_rtl($locale=null) {