diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php index 9b8db8b3d2d..f01154412be 100644 --- a/lib/Cake/Utility/CakeTime.php +++ b/lib/Cake/Utility/CakeTime.php @@ -949,10 +949,10 @@ public static function format($date, $format = null, $default = false, $timezone $_time = is_numeric($time) ? false : self::fromString($date, $timezone); if (is_numeric($_time) && $time === false) { - return self::i18nFormat($_time, $format, $invalid, $timezone); + return self::i18nFormat($_time, $format, $default, $timezone); } - if ($time === false && $invalid !== false) { - return $invalid; + if ($time === false && $default !== false) { + return $default; } return date($date, $time); }