Browse Source

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

tags/2.0.0-beta
Gudz Taras 11 years ago
parent
commit
11c78cb4fb
  1. 2
      framework/yii/validators/FileValidator.php
  2. 4
      framework/yii/validators/ImageValidator.php

2
framework/yii/validators/FileValidator.php

@ -168,7 +168,7 @@ class FileValidator extends Validator
* @param string $attribute the attribute being validated * @param string $attribute the attribute being validated
* @param UploadedFile $file uploaded file passed to check against a set of rules * @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) { switch ($file->error) {
case UPLOAD_ERR_OK: case UPLOAD_ERR_OK:

4
framework/yii/validators/ImageValidator.php

@ -145,11 +145,11 @@ class ImageValidator extends FileValidator
* @param string $attribute the attribute being validated * @param string $attribute the attribute being validated
* @param UploadedFile $file uploaded file passed to check against a set of rules * @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); parent::validateFile($object, $attribute, $file);
if (false === $object->hasErrors($attribute)) { if (!$object->hasErrors($attribute)) {
$this->validateImage($object, $attribute, $file); $this->validateImage($object, $attribute, $file);
} }
} }

Loading…
Cancel
Save