aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-10 14:12:36 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-09-17 14:23:34 +0200
commit3dbac0f88ba056b19b29fdcabd76074a8dd250d5 (patch)
tree05ef519352c62f69ea0e1a5e24cbe8342a4c818d /phpBB/includes
parent9ebee7de323eae3ac86f025f44429d2d4bc995b1 (diff)
downloadforums-3dbac0f88ba056b19b29fdcabd76074a8dd250d5.tar
forums-3dbac0f88ba056b19b29fdcabd76074a8dd250d5.tar.gz
forums-3dbac0f88ba056b19b29fdcabd76074a8dd250d5.tar.bz2
forums-3dbac0f88ba056b19b29fdcabd76074a8dd250d5.tar.xz
forums-3dbac0f88ba056b19b29fdcabd76074a8dd250d5.zip
[ticket/12858] Use UTC for time info in footer and hide offset if it's 0
PHPBB3-12858
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7ee8c49161..d5a7bd925b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -945,6 +945,11 @@ function phpbb_format_timezone_offset($tz_offset)
$sign = ($tz_offset < 0) ? '-' : '+';
$time_offset = abs($tz_offset);
+ if ($time_offset == 0)
+ {
+ return '';
+ }
+
$offset_seconds = $time_offset % 3600;
$offset_minutes = $offset_seconds / 60;
$offset_hours = ($time_offset - $offset_seconds) / 3600;
@@ -4913,7 +4918,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
}
$dt = $user->create_datetime();
- $timezone_offset = 'GMT' . phpbb_format_timezone_offset($dt->getOffset());
+ $timezone_offset = $user->lang('UTC') . phpbb_format_timezone_offset($dt->getOffset());
$timezone_name = $user->timezone->getName();
if (isset($user->lang['timezones'][$timezone_name]))
{