ExistValidator refactoring

3e94b248 · Alexander Kochetov · 3a0e04f3 · 3e94b248
Commit 3e94b248 authored May 13, 2014 by Alexander Kochetov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ExistValidator.php framework/validators/ExistValidator.php +6 -4

No files found.
--- a/framework/validators/ExistValidator.php
+++ b/framework/validators/ExistValidator.php
@@ -97,11 +97,13 @@ class ExistValidator extends Validator
            $params = [$targetAttribute => $object->$attribute];
        }

-        foreach ($params as $value) {
-            if (!$this->allowArray && is_array($value)) {
-                $this->addError($object, $attribute, Yii::t('yii', '{attribute} is invalid.'));
+        if (!$this->allowArray) {
+            foreach ($params as $value) {
+                if (is_array($value)) {
+                    $this->addError($object, $attribute, Yii::t('yii', '{attribute} is invalid.'));

-                return;
+                    return;
+                }
            }
        }