Add child error to primary model

mdmsoft · Feb 22, 2016 · 95542f8 · 95542f8
1 parent 48da802
commit 95542f8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/RelationTrait.php b/RelationTrait.php
@@ -190,7 +190,7 @@ protected function doAfterValidate()
                     }
                     if (!$child->validate()) {
                         $errors = $this->_relatedErrors[$name][$index] = $child->getFirstErrors();
-                        $this->addError($name, "{$index}: ".reset($errors));
+                        $this->addError($name, "{$index}: " . reset($errors));
                         $error = true;
                     }
                 }
@@ -282,6 +282,9 @@ protected function childIsEqual($model1, $model2, $keys)
         if (method_exists($this, 'isEqual')) {
             return $this->isEqual($model1, $model2, $keys);
         }
+        if (empty($keys)) {
+            return false;
+        }
         foreach ($keys as $key) {
             if (ArrayHelper::getValue($model1, $key) != ArrayHelper::getValue($model2, $key)) {
                 return false;