Another fix for php 5.4

cakephp · Apr 21, 2014 · 5cef679 · 5cef679
1 parent 093117b
commit 5cef679
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 		);