Changed validateFile() method access from protected to public, fixed …

…hasErrors check
Izumi-kun · Nov 5, 2013 · 11c78cb · 11c78cb
1 parent 3ef20e5
commit 11c78cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/yii/validators/FileValidator.php b/framework/yii/validators/FileValidator.php
@@ -168,7 +168,7 @@ public function validateAttribute($object, $attribute)
 	 * @param string $attribute the attribute being validated
 	 * @param UploadedFile $file uploaded file passed to check against a set of rules
 	 */
-	protected function validateFile($object, $attribute, $file)
+	public function validateFile($object, $attribute, $file)
 	{
 		switch ($file->error) {
 			case UPLOAD_ERR_OK:

diff --git a/framework/yii/validators/ImageValidator.php b/framework/yii/validators/ImageValidator.php
@@ -145,11 +145,11 @@ public function init()
 	 * @param string $attribute the attribute being validated
 	 * @param UploadedFile $file uploaded file passed to check against a set of rules
 	 */
-	protected function validateFile($object, $attribute, $file)
+	public function validateFile($object, $attribute, $file)
 	{
 		parent::validateFile($object, $attribute, $file);
 
-		if (false === $object->hasErrors($attribute)) {
+		if (!$object->hasErrors($attribute)) {
 			$this->validateImage($object, $attribute, $file);
 		}
 	}