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

Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system

Browse source
This commit is contained in:
Mark van Driel 2013-08-15 08:58:05 +02:00
parent 559fb5805b
commit 1595287290
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -583,6 +583,9 @@ class CakeTimeTest extends CakeTestCase {
$result = $this->Time->format('nonsense', '%d-%m-%Y', 'invalid', 'UTC'); $result = $this->Time->format('nonsense', '%d-%m-%Y', 'invalid', 'UTC');
$this->assertEquals('invalid', $result); $this->assertEquals('invalid', $result);
$result = $this->Time->format('0000-00-00', '%d-%m-%Y', 'invalid');
$this->assertEquals('invalid', $result);
} }
/** /**

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

@ -328,7 +328,12 @@ class CakeTime {
} elseif ($dateString instanceof DateTime) { } elseif ($dateString instanceof DateTime) {
$date = (int)$dateString->format('U'); $date = (int)$dateString->format('U');
} else { } else {
$date = strtotime($dateString); // workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system.
if (substr($dateString, 0, 10) === '0000-00-00') {
$date = false;
} else {
$date = strtotime($dateString);
}
} }
if ($date === -1 || empty($date)) { if ($date === -1 || empty($date)) {