diff --git a/core/modules/openid/openid.test b/core/modules/openid/openid.test index 7a4c9cf..b3961cd 100644 --- a/core/modules/openid/openid.test +++ b/core/modules/openid/openid.test @@ -571,7 +571,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase { $user = user_load_by_name('john'); $this->assertTrue($user, t('User was registered with right username.')); - $this->assertFalse($user->preferred_langcode, t('No user language was saved.')); + $this->assertEqual($user->preferred_langcode, language_default()->langcode, t('User language is site default.')); $this->assertFalse($user->data, t('No additional user info was saved.')); // Follow the one-time login that was sent in the welcome e-mail. @@ -611,7 +611,7 @@ class OpenIDRegistrationTestCase extends OpenIDWebTestCase { $user = user_load_by_name('john'); $this->assertTrue($user, t('User was registered with right username.')); - $this->assertFalse($user->preferred_langcode, t('No user language was saved.')); + $this->assertEqual($user->preferred_langcode, language_default()->langcode, t('User language is site default.')); $this->assertFalse($user->data, t('No additional user info was saved.')); // Follow the one-time login that was sent in the welcome e-mail. diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 55e69be..27c4b47 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1123,7 +1123,7 @@ function user_account_form(&$form, &$form_state) { ); $form['language']['preferred_langcode'] = array( '#type' => 'value', - '#value' => '', + '#value' => language_default()->langcode, ); }