From f584cdf74fb734e839cebe40631bd913c766a553 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Fri, 6 Aug 2004 04:30:50 +0000
Subject: [PATCH] #8154 - Default user timezone to site timezone
---
modules/system.module | 2 +-
modules/system/system.module | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/system.module b/modules/system.module
index 170fd8090ca7..10199e075149 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -106,7 +106,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
if (variable_get('configurable_timezones', 1)) {
$zones = _system_zonelist();
- $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', $edit['timezone'], $zones, t('Select what time you currently have and your time zone settings will be set appropriately.')), 'weight' => 2);
+ $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', isset($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0), $zones, t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')), 'weight' => 2);
}
return $data;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 170fd8090ca7..10199e075149 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -106,7 +106,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
if (variable_get('configurable_timezones', 1)) {
$zones = _system_zonelist();
- $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', $edit['timezone'], $zones, t('Select what time you currently have and your time zone settings will be set appropriately.')), 'weight' => 2);
+ $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', isset($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0), $zones, t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')), 'weight' => 2);
}
return $data;
}
--
GitLab