summaryrefslogtreecommitdiff
path: root/modules/user/controllers
diff options
context:
space:
mode:
authorAndy Staudacher <andy.st@gmail.com>2010-02-02 13:41:50 -0800
committerAndy Staudacher <andy.st@gmail.com>2010-02-02 13:41:50 -0800
commit31aaf7555f51dd80cf1e97fd3c20a1c245cbf61b (patch)
tree594ca1cebbe5b8b58b4c50cb3c88487574dba712 /modules/user/controllers
parentbe5f38adea89bdb95be359aea3d97615b6b530a3 (diff)
parent3c3671cff25f28e21a702b1f665a6baa282d045f (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'modules/user/controllers')
-rw-r--r--modules/user/controllers/admin_users.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index c11b0596..03d9858b 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -323,7 +323,7 @@ class Admin_Users_Controller extends Admin_Controller {
return $form;
}
- private function _add_locale_dropdown(&$form, $user=null) {
+ private static function _add_locale_dropdown(&$form, $user=null) {
$locales = locales::installed();
foreach ($locales as $locale => $display_name) {
$locales[$locale] = SafeString::of_safe_html($display_name);