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

Merge branch 'patch-1' of https://github.com/PowerGamer1/yii2 into PowerGamer1-patch-1

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2015-12-05 21:22:24 +02:00
parent bea90e1228 4f25734509
commit d5eff682a0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/validators/FileValidator.php
View File

@ -63,7 +63,8 @@ class FileValidator extends Validator
/** /**
* @var integer the maximum file count the given attribute can hold. * @var integer the maximum file count the given attribute can hold.
* It defaults to 1, meaning single file upload. By defining a higher number, * It defaults to 1, meaning single file upload. By defining a higher number,
* multiple uploads become possible. * multiple uploads become possible. Setting it to 0 means there is no limit on
* the amount of files that can be uploaded.
* @see tooMany for the customized message when too many files are uploaded. * @see tooMany for the customized message when too many files are uploaded.
*/ */
public $maxFiles = 1; public $maxFiles = 1;
@ -168,7 +169,7 @@ class FileValidator extends Validator
*/ */
public function validateAttribute($model, $attribute) public function validateAttribute($model, $attribute)
{ {
if ($this->maxFiles > 1) { if ($this->maxFiles != 1) {
$files = $model->$attribute; $files = $model->$attribute;
if (!is_array($files)) { if (!is_array($files)) {
$this->addError($model, $attribute, $this->uploadRequired); $this->addError($model, $attribute, $this->uploadRequired);
@ -184,7 +185,7 @@ class FileValidator extends Validator
if (empty($files)) { if (empty($files)) {
$this->addError($model, $attribute, $this->uploadRequired); $this->addError($model, $attribute, $this->uploadRequired);
} }
if (count($files) > $this->maxFiles) { if ($this->maxFiles && count($files) > $this->maxFiles) {
$this->addError($model, $attribute, $this->tooMany, ['limit' => $this->maxFiles]); $this->addError($model, $attribute, $this->tooMany, ['limit' => $this->maxFiles]);
} else { } else {
foreach ($files as $file) { foreach ($files as $file) {