summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-19 01:24:44 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-11-19 01:24:44 +0000
commite0a67c1c00b766378ef39c2b8f4a3eedbfc0c3b2 (patch)
tree13d840fd303c3f499e2170d6e6dbce89d636bc8e
parentff1c072b2e9036eb8000d8aeea3317f4944b0d4f (diff)
downloadbrdo-e0a67c1c00b766378ef39c2b8f4a3eedbfc0c3b2.tar.gz
brdo-e0a67c1c00b766378ef39c2b8f4a3eedbfc0c3b2.tar.bz2
#636666 by c960657: Don't auto-detect timezones after a failed submit.
-rw-r--r--modules/system/system.module2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index 7385b8d93..deb00f7e6 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1795,7 +1795,7 @@ function system_user_timezone(&$form, &$form_state) {
'#options' => system_time_zones($account->uid != $user->uid),
'#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
);
- if (!isset($account->timezone) && $account->uid == $user->uid) {
+ if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
$form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Please confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
drupal_add_js('misc/timezone.js');