adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forgot to include complete patch in last commit :(

Browse source 
Note: It's not good to commit while watching tv
This commit is contained in:
Jose Lorenzo Rodriguez 2012-06-09 15:00:47 -04:30
parent d13deb7da2
commit 2a90baae0c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Utility/CakeTime.php
View file

@ -949,10 +949,10 @@ class CakeTime {
$_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);
}