Added workaround for strtotime("0000-00-00 00:00:00") returning -6216…

…9955200 on a 64 bit system
cakephp · Aug 15, 2013 · 1595287 · 1595287
1 parent 559fb58
commit 1595287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -583,6 +583,9 @@ public function testFormat() {
 
 		$result = $this->Time->format('nonsense', '%d-%m-%Y', 'invalid', 'UTC');
 		$this->assertEquals('invalid', $result);
+
+		$result = $this->Time->format('0000-00-00', '%d-%m-%Y', 'invalid');
+		$this->assertEquals('invalid', $result);
 	}
 
 /**

diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
@@ -328,7 +328,12 @@ public static function fromString($dateString, $timezone = null) {
 		} elseif ($dateString instanceof DateTime) {
 			$date = (int)$dateString->format('U');
 		} 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)) {