Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Forgot to include complete patch in last commit :(

Note: It's not good to commit while watching tv
  • Loading branch information...
commit 2a90baae0cc6b9ab5bafa2d223dee3d02734581b 1 parent d13deb7
@lorenzo lorenzo authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/Cake/Utility/CakeTime.php
View
6 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);
}
Please sign in to comment.
Something went wrong with that request. Please try again.