diff --git a/core/modules/system/system.module b/core/modules/system/system.module index e7cb4ca..73cde21 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -2408,7 +2408,6 @@ function system_user_timezone(&$form, &$form_state) { $form['timezone']['timezone'] = array( '#type' => 'select', '#title' => t('Time zone'), - //'#default_value' => isset($account->timezone) ? $account->timezone : ($account->id() == $user->id() ? config('system.date')->get('timezone.default') : ''), '#default_value' => isset($account->timezone) ? $account->timezone : config('system.date')->get('timezone.default'), '#options' => system_time_zones($account->id() != $user->id()), '#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'), diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php index ac5aa22..7be738c 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php @@ -31,7 +31,8 @@ function testUserTimeZone() { ->set('timezone.default', 'America/Los_Angeles') ->save(); entity_load('date_format', 'medium') - ->setPattern('Y-m-d H:i T') ->save(); + ->setPattern('Y-m-d H:i T') + ->save(); // Create a user account and login. $web_user = $this->drupalCreateUser();