diff options
Diffstat (limited to 'includes/common.inc')
| -rw-r--r-- | includes/common.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc index 2f5df9e48..feab010d2 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -915,7 +915,12 @@ function format_interval($timestamp, $granularity = 2) { function format_date($timestamp, $type = 'medium', $format = '', $timezone = NULL) { if ($timezone === NULL) { global $user; - $timezone = $user->uid ? $user->timezone : variable_get('date_default_timezone', 0); + if (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone)) { + $timezone = $user->timezone; + } + else { + $timezone = variable_get('date_default_timezone', 0); + } } $timestamp += $timezone; |