Conditionally set invalid property.

cakephp · Jan 3, 2016 · 5426aeb · 5426aeb
1 parent 357a729
commit 5426aeb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Datasource/RulesChecker.php b/src/Datasource/RulesChecker.php
@@ -328,11 +328,10 @@ protected function _addError($rule, $name, $options)
             }
             $entity->errors($options['errorField'], $message);
 
-            $invalid = null;
             if (isset($entity->{$options['errorField']})) {
-                $invalid = $entity->{$options['errorField']};
+                $invalidValue = $entity->{$options['errorField']};
+                $entity->invalid($options['errorField'], $invalidValue);
             }
-            $entity->invalid($options['errorField'], $invalid);
 
             return $pass === true;
         };