diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/user/helpers | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts:
modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'modules/user/helpers')
| -rw-r--r-- | modules/user/helpers/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 9e9d4ca1..a59588f8 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -82,7 +82,7 @@ class user_Core { $locales = locale::installed(); if (count($locales) > 1) { // Put "none" at the first position in the array - $locales = array_merge(array("" => t("« none »")), $locales); + $locales = array_merge(array("" => t("« none »")), $locales); $selected_locale = ($user && $user->locale) ? $user->locale : ""; $form->dropdown("locale") ->label(t("Language Preference")) |