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

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

Browse source 
the format() function
This commit is contained in:
Jose Lorenzo Rodriguez 2012-09-25 15:23:46 +02:00
parent b0822d2246
commit 6818d69fc3
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -941,15 +941,11 @@ class CakeTime {
* @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);
}