From 1725386c16c1d4f272d1e8bd4a374bdf0f49fb82 Mon Sep 17 00:00:00 2001 From: euromark Date: Wed, 12 Feb 2014 21:52:18 +0100 Subject: [PATCH] Fix uploadError validation rule to work with OS Win. Here the error is string, not integer. --- lib/Cake/Test/Case/Utility/ValidationTest.php | 2 ++ lib/Cake/Utility/Validation.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index cc60f7df9be..aef449c745f 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -2368,9 +2368,11 @@ public function testMimeTypeFalse() { public function testUploadError() { $this->assertTrue(Validation::uploadError(0)); $this->assertTrue(Validation::uploadError(array('error' => 0))); + $this->assertTrue(Validation::uploadError(array('error' => '0'))); $this->assertFalse(Validation::uploadError(2)); $this->assertFalse(Validation::uploadError(array('error' => 2))); + $this->assertFalse(Validation::uploadError(array('error' => '2'))); } /** diff --git a/lib/Cake/Utility/Validation.php b/lib/Cake/Utility/Validation.php index e78a956cf81..b990b6ca9bc 100644 --- a/lib/Cake/Utility/Validation.php +++ b/lib/Cake/Utility/Validation.php @@ -964,7 +964,7 @@ public static function uploadError($check) { $check = $check['error']; } - return $check === UPLOAD_ERR_OK; + return (int)$check === UPLOAD_ERR_OK; } /**