close mootensai#32

Thanks!!
RobinKamps · Mar 30, 2017 · 96c329a · 96c329a
1 parent 5c87ae9
commit 96c329a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/RelationTrait.php b/RelationTrait.php
@@ -64,6 +64,9 @@ public function loadAll($POST, $skippedRelations = [])
                             if (array_filter($relPost)) {
                                 /* @var $relObj ActiveRecord */
                                 $relObj = (empty($relPost[$relPKAttr[0]])) ? new $relModelClass : $relModelClass::findOne($relPost[$relPKAttr[0]]);
+                                if (is_null($relObj)) {
+                                    $relObj = new $relModelClass();
+                                }
                                 $relObj->load($relPost, '');
                                 $container[] = $relObj;
                             }
@@ -326,14 +329,14 @@ public function getRelationData()
             if ($method->name === 'deleteWithRelated') {
                 continue;
             }
-            if (strpos($method->name, 'get') === false) {
+            if (strpos($method->name, 'get') !== 0) {
                 continue;
             }
             try {
                 $rel = call_user_func(array($this, $method->name));
                 if ($rel instanceof \yii\db\ActiveQuery) {
-                    $name = lcfirst(str_replace('get', '', $method->name));
-                    $stack[$name]['name'] = lcfirst(str_replace('get', '', $method->name));
+                    $name = lcfirst(preg_replace('/^get/', '', $method->name));
+                    $stack[$name]['name'] = lcfirst(preg_replace('/^get/', '', $method->name));
                     $stack[$name]['method'] = $method->name;
                     $stack[$name]['ismultiple'] = $rel->multiple;
                     $stack[$name]['modelClass'] = $rel->modelClass;