fixes #19

mootensai · Jul 8, 2016 · b41ca3a · b41ca3a
1 parent 549231d
commit b41ca3a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/RelationTrait.php b/RelationTrait.php
@@ -29,14 +29,16 @@ public function loadAll($POST, $skippedRelations = [])
                     /* @var $relObj ActiveRecord */
                     $isHasMany = is_array($value) && is_array(current($value));
                     $relName = ($isHasMany) ? lcfirst(Inflector::pluralize($key)) : lcfirst($key);
+
+                    if (in_array($relName, $skippedRelations) || !array_key_exists($relName,$relData)){
+                        continue;
+                    }
+
                     $AQ = $this->getRelation($relName);
                     $relModelClass = $AQ->modelClass;
                     $relPKAttr = $relModelClass::primaryKey();
                     $isManyMany = count($relPKAttr) > 1;
 
-                    if (in_array($relName, $skippedRelations) || !array_key_exists($relName,$relData))
-                        continue;
-
                     if ($isManyMany) {
                         $container = [];
                         foreach ($value as $relPost) {