Register the related models in the registry (see contao/core-bundle#333…

…).
contao · Aug 24, 2015 · 8ede060 · 8ede060
1 parent 2058492
commit 8ede060
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS changelog
 Version 3.5.3 (2015-XX-XX)
 --------------------------
 
+### Fixed
+Register the related models in the registry (see contao/core-bundle#333).
+
 ### Fixed
 Correctly escape in the `findMultipleFilesByFolder()` method (see #7966).
 

diff --git a/system/modules/core/library/Contao/Model.php b/system/modules/core/library/Contao/Model.php
@@ -136,6 +136,8 @@ public function __construct(\Database\Result $objResult=null)
 				}
 			}
 
+			$objRegistry = \Model\Registry::getInstance();
+
 			// Create the related models
 			foreach ($arrRelated as $key=>$row)
 			{
@@ -152,7 +154,7 @@ public function __construct(\Database\Result $objResult=null)
 				}
 				else
 				{
-					$objRelated = \Model\Registry::getInstance()->fetch($table, $row[$intPk]);
+					$objRelated = $objRegistry->fetch($table, $row[$intPk]);
 
 					if ($objRelated !== null)
 					{
@@ -163,14 +165,16 @@ public function __construct(\Database\Result $objResult=null)
 						/** @var static $objRelated */
 						$objRelated = new $strClass();
 						$objRelated->setRow($row);
+
+						$objRegistry->register($objRelated);
 					}
 
 					$this->arrRelated[$key] = $objRelated;
 				}
 			}
 
 			$this->setRow($arrData); // see #5439
-			\Model\Registry::getInstance()->register($this);
+			$objRegistry->register($this);
 		}
 	}
 

diff --git a/system/modules/core/library/Contao/Model/Registry.php b/system/modules/core/library/Contao/Model/Registry.php
@@ -145,7 +145,7 @@ public function fetchByAlias($strTable, $strAlias, $varValue)
 	/**
 	 * Register a model in the registry
 	 *
-	 * @param \Model $objModel The model object
+	 * @param \Model|\Contao\Model $objModel The model object
 	 *
 	 * @throws \RuntimeException If the instance exists already
 	 */