Replaced the 1200 pixel limit when resizing images with the values de…

…fined in the system settings (see #5268)

CHANGELOG.md

@@ -4,6 +4,10 @@ Contao Open Source CMS Changelog
 Version 2.11.9 (2013-XX-XX)
 ---------------------------
 
+### Fixed
+Replaced the 1200 pixel limit when resizing images with the values defined in
+the system settings (see #5268).
+
 ### Fixed
 Make sure there is an array in `Controller::generateMargin()` (see #5217).
 

system/libraries/Controller.php

@@ -1006,7 +1006,7 @@ protected function getImage($image, $width, $height, $mode='', $target=null, $fo
 		}
 
 		// Return the path to the original image if the GDlib cannot handle it
-		if (!extension_loaded('gd') || !$objFile->isGdImage || $objFile->width > $GLOBALS['TL_CONFIG']['gdMaxImgWidth'] || $objFile->height > $GLOBALS['TL_CONFIG']['gdMaxImgHeight'] || (!$width && !$height) || $width > 1200 || $height > 1200)
+		if (!extension_loaded('gd') || !$objFile->isGdImage || $objFile->width > $GLOBALS['TL_CONFIG']['gdMaxImgWidth'] || $objFile->height > $GLOBALS['TL_CONFIG']['gdMaxImgHeight'] || (!$width && !$height) || $width > $GLOBALS['TL_CONFIG']['gdMaxImgWidth'] || $height > $GLOBALS['TL_CONFIG']['gdMaxImgHeight'])
 		{
 			return $this->urlEncode($image);
 		}