Merge branch 'hotfix/3.4.2'

contao · Jan 22, 2015 · b7d0a7e · b7d0a7e
2 parents 960155b + e71f240
commit b7d0a7e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/system/config/constants.php b/system/config/constants.php
@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.4');
-define('BUILD', '1');
+define('BUILD', '2');
 define('LONG_TERM_SUPPORT', false);
 
 

diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -1,6 +1,13 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.4.2 (2015-01-22)
+--------------------------
+
+### Fixed
+Fix an infinite recursion problem in the `FilesModel` class (see #7588).
+
+
 Version 3.4.1 (2015-01-22)
 --------------------------
 

diff --git a/system/modules/core/library/Contao/Model.php b/system/modules/core/library/Contao/Model.php
@@ -780,23 +780,19 @@ public static function findMultipleByIds($arrIds, array $arrOptions=array())
 	 */
 	public static function findOneBy($strColumn, $varValue, array $arrOptions=array())
 	{
-		$intId = is_array($varValue) ? $varValue[0] : $varValue;
-
 		// Try to load from the registry
 		if (empty($arrOptions))
 		{
-			if (is_array($strColumn))
-			{
-				if (count($strColumn) == 1 && $strColumn[0] == static::$strPk)
-				{
-					return static::findByPk($intId, $arrOptions);
-				}
-			}
-			else
+			$arrColumn = (array) $strColumn;
+
+			if (count($arrColumn) == 1 && $arrColumn[0] == static::$strPk)
 			{
-				if ($strColumn == static::$strPk)
+				$intId = is_array($varValue) ? $varValue[0] : $varValue;
+				$objModel = \Model\Registry::getInstance()->fetch(static::$strTable, $intId);
+
+				if ($objModel !== null)
 				{
-					return static::findByPk($intId, $arrOptions);
+					return $objModel;
 				}
 			}
 		}

diff --git a/system/modules/repository/classes/RepositorySettings.php b/system/modules/repository/classes/RepositorySettings.php
@@ -17,6 +17,7 @@
 
 // valid core versions in descending order
 define('REPOSITORY_COREVERSIONS',
+		'30040029,30040029;'.	// 3.4.2
 		'30040019,30040019;'.	// 3.4.1
 		'30040009,30040009;'.	// 3.4.0
 		'30040006,30040006;'.	// 3.4.0-RC1