Permalink
Browse files

Fixed issue in CakeTime that it would apply userOffset twice when using

the format() function
  • Loading branch information...
lorenzo committed Sep 25, 2012
1 parent b0822d2 commit 6818d69fc344c8c44b72c1701380a43fba1ba155
Showing with 3 additions and 7 deletions.
  1. +3 −7 lib/Cake/Utility/CakeTime.php
@@ -941,15 +941,11 @@ public static function gmt($dateString = null) {
* @see CakeTime::i18nFormat()
*/
public static function format($date, $format = null, $default = false, $timezone = null) {
//Backwards compatible params order
//Backwards compatible params re-order test
$time = self::fromString($format, $timezone);
$_time = is_numeric($time) ? false : self::fromString($date, $timezone);
if (is_numeric($_time) && $time === false) {
return self::i18nFormat($_time, $format, $default, $timezone);
}
if ($time === false && $default !== false) {
return $default;
if ($time === false) {
return self::i18nFormat($date, $format, $default, $timezone);
}
return date($date, $time);
}

0 comments on commit 6818d69

Please sign in to comment.