diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-20 06:56:17 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-20 06:56:17 +0000 |
| commit | 53f53b6db5949c7d8e6b57253987a4eddf7a26ca (patch) | |
| tree | ad8ad53d7d351d6dbcf10e9a2f53a53cd6e40850 /install.php | |
| parent | 07211d4019373820abe9e429ff81656105dcbb9d (diff) | |
| download | brdo-53f53b6db5949c7d8e6b57253987a4eddf7a26ca.tar.gz brdo-53f53b6db5949c7d8e6b57253987a4eddf7a26ca.tar.bz2 | |
#11077 by mfb, KarenS, macgirvin, and jjkd: Can you say Daylight Savings Time? I bet you didn't think Drupal ever would! :)
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/install.php b/install.php index a510df20c..9b91d56d5 100644 --- a/install.php +++ b/install.php @@ -726,6 +726,8 @@ function install_tasks($profile, $task) { // Add JavaScript validation. _user_password_dynamic_validation(); drupal_add_js(drupal_get_path('module', 'system') . '/system.js'); + // Add JavaScript time zone detection. + drupal_add_js('misc/timezone.js'); // We add these strings as settings because JavaScript translation does not // work on install time. drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail')), 'cleanURL' => array('success' => st('Your server has been successfully tested to support this feature.'), 'failure' => st('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => st('Testing clean URLs...'))), 'setting'); @@ -734,7 +736,6 @@ function install_tasks($profile, $task) { if (Drupal.jsEnabled) { $(document).ready(function() { Drupal.cleanURLsInstallCheck(); - Drupal.setDefaultTimezone(); }); }', 'inline'); // Build menu to allow clean URL check. @@ -1081,10 +1082,11 @@ function install_configure_form(&$form_state, $url) { $form['server_settings']['date_default_timezone'] = array( '#type' => 'select', '#title' => st('Default time zone'), - '#default_value' => 0, - '#options' => _system_zonelist(), + '#default_value' => date_default_timezone_get(), + '#options' => system_time_zones(), '#description' => st('By default, dates in this site will be displayed in the chosen time zone.'), '#weight' => 5, + '#attributes' => array('class' => 'timezone-detect'), ); $form['server_settings']['clean_url'] = array( |