From e0a67c1c00b766378ef39c2b8f4a3eedbfc0c3b2 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Thu, 19 Nov 2009 01:24:44 +0000
Subject: #636666 by c960657: Don't auto-detect timezones after a failed
 submit.

---
 modules/system/system.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/system/system.module')

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');
-- 
cgit v1.2.3