diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
| commit | fecac4a8596a69088270e48a90868e845fc8f4ca (patch) | |
| tree | a4683906d481d1091e218c9b6662a1997cb11086 /modules/gallery/helpers/locales.php | |
| parent | 8849594aa17768f564e45370a62f01e440570dcf (diff) | |
| parent | 3b16d0662b8a4b06f4be72165c858a1231e9bd67 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/gallery/helpers/locales.php')
| -rw-r--r-- | modules/gallery/helpers/locales.php | 4 |
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) { |