php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gudz Taras
2013-11-05 06:15:42 +04:00
parent 3ef20e591d
commit 11c78cb4fb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/validators/FileValidator.php
View File

@@ -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
View File

@@ -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);
} }
} }