summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/locale/locale.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 078231744..b06152bd0 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -199,7 +199,7 @@ function locale_user($type, $edit, &$user, $category = NULL) {
$languages = $languages['1'];
// If the user is being created, we set the user language to the page language.
- $user_language = $user ? user_language($user) : $language;
+ $user_preferred_language = $user ? user_preferred_language($user) : $language;
$names = array();
foreach ($languages as $langcode => $language) {
@@ -214,7 +214,7 @@ function locale_user($type, $edit, &$user, $category = NULL) {
$form['locale']['language'] = array(
'#type' => 'radios',
'#title' => t('Language'),
- '#default_value' => $user_language->language,
+ '#default_value' => $user_preferred_language->language,
'#options' => $names,
'#description' => t('Sets the default site interface and e-mail language for this account.'),
);