Fixed bug: Parent record is forced to be populated after a find opera…

…tion
jlorente · Apr 22, 2015 · 92f2a6a · 92f2a6a
1 parent e681272
commit 92f2a6a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/ActiveRecordInheritanceTrait.php b/src/ActiveRecordInheritanceTrait.php
@@ -86,15 +86,24 @@ private function _parent() {
                 throw new BaseException('Classes that use the \jlorente\db\ActiveRecordInheritanceTrait must implement \jlorente\db\ActiveRecordInheritanceInterface');
             }
             $pClass = static::extendsFrom();
-            if ($this->id !== null) {
-                $this->_parent = $pClass::findOne($this->{$this->parentAttribute()});
+            if ($this->getIsNewRecord() === false) {
+                $this->_parent = $this->parent;
             } else {
                 $this->_parent = new $pClass();
             }
         }
         return $this->_parent;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public static function populateRecord($record, $row) {
+        parent::populateRecord($record, $row);
+
+        $record->_parent = $record->parent;
+    }
+
     /**
      * @inheritdoc
      */