Reduce complexity in Registry::fetch()

contao · Mar 30, 2015 · 81bd651 · 81bd651
1 parent 7032e63
commit 81bd651
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/system/modules/core/library/Contao/Model/Registry.php b/system/modules/core/library/Contao/Model/Registry.php
@@ -113,9 +113,24 @@ public function fetch($strTable, $varKey, $strAlias = null)
 		}
 
 		// Try to find in aliases
-		if (isset($this->arrRegistryAliases[$strTable][$strAlias][$varKey]))
+        return $this->fetchByAlias($strTable, $strAlias, $varKey);
+	}
+
+
+	/**
+	 * Fetch a model by an alias
+	 *
+	 * @param string  $strTable The table name
+	 * @param string  $strAlias The alias
+	 * @param mixed   $varValue The alias value
+	 *
+	 * @return \Model|null The model or null
+	 */
+	public function fetchByAlias($strTable, $strAlias, $varValue)
+	{
+		if (isset($this->arrRegistryAliases[$strTable][$strAlias][$varValue]))
 		{
-			$strPk = $this->arrRegistryAliases[$strTable][$strAlias][$varKey];
+			$strPk = $this->arrRegistryAliases[$strTable][$strAlias][$varValue];
 
 			if (isset($this->arrRegistry[$strTable][$strPk]))
 			{