diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-19 08:46:25 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-19 08:46:25 -0700 |
| commit | 737828f00911ba145697ef4060401e50e5b711af (patch) | |
| tree | 4ec7097ac7c5ffeb3b00c62d09ce9d5955a5c5d8 /phpBB/feed.php | |
| parent | c896cd06dd8fba023e2ab6f9cd3f8293d382fb70 (diff) | |
| parent | 7df1c84447903ecc97a8418339ec6933bdfc9035 (diff) | |
| download | forums-737828f00911ba145697ef4060401e50e5b711af.tar forums-737828f00911ba145697ef4060401e50e5b711af.tar.gz forums-737828f00911ba145697ef4060401e50e5b711af.tar.bz2 forums-737828f00911ba145697ef4060401e50e5b711af.tar.xz forums-737828f00911ba145697ef4060401e50e5b711af.zip | |
Merge pull request #843 from nickvergessen/feature/new-tz-handling
Feature/new tz handling
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index fcf42a83ae..9b7ef3a575 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -254,16 +254,8 @@ function feed_format_date($time) { global $user; - $zone_offset = (int) $user->timezone + (int) $user->dst; - - $sign = ($zone_offset < 0) ? '-' : '+'; - $time_offset = abs($zone_offset); - - $offset_seconds = $time_offset % 3600; - $offset_minutes = $offset_seconds / 60; - $offset_hours = ($time_offset - $offset_seconds) / 3600; - - $offset_string = sprintf("%s%02d:%02d", $sign, $offset_hours, $offset_minutes); + $zone_offset = $user->create_datetime()->getOffset(); + $offset_string = phpbb_format_timezone_offset($zone_offset); } return gmdate("Y-m-d\TH:i:s", $time + $zone_offset) . $offset_string; |