diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-29 19:33:42 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-29 19:33:42 -0700 |
| commit | 8af19c0625eca7cd7360ebc1036cd654bdf88145 (patch) | |
| tree | a3dd48cc6a93c20356c4c47faf40023a307d1d1e | |
| parent | 8865d78483c5967da17e3f3d185eb19909ea7fe0 (diff) | |
| parent | b57be646fe9fb07b5ebdd38a66b16de1b87d2a2d (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/helpers/locale.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/gallery/helpers/locale.php b/modules/gallery/helpers/locale.php index 9783a53a..41b78834 100644 --- a/modules/gallery/helpers/locale.php +++ b/modules/gallery/helpers/locale.php @@ -50,7 +50,9 @@ class locale_Core { static function update_installed($locales) { // Ensure that the default is included... $default = module::get_var("gallery", "default_locale"); - $locales = array_merge($locales, array($default)); + $locales = in_array($default, $locales) + ? $locales + : array_merge($locales, array($default)); module::set_var("gallery", "installed_locales", join("|", $locales)); } |