From 5cef679386e664441c0a5b05074721aa54222da6 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Mon, 21 Apr 2014 22:47:14 +0200 Subject: [PATCH] Another fix for php 5.4 --- src/Utility/Time.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Utility/Time.php b/src/Utility/Time.php index 54d627b88d5..ab9daa3cb49 100644 --- a/src/Utility/Time.php +++ b/src/Utility/Time.php @@ -552,12 +552,12 @@ protected function _formatObject($date, $format, $locale) { $pattern = $format; } - $timezone = $date->getTimezone(); + $timezone = $date->getTimezone()->getName(); $formatter = datefmt_create( $locale, $dateFormat, $timeFormat, - $timezone, + $timezone === '+00:00' ? 'UTC' : $timezone, $calendar, $pattern );