Use important part also if no image size record is used

madeyourday · Oct 2, 2014 · d719730 · d719730
1 parent abf98b8
commit d719730
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/system/modules/core/library/Contao/Image.php b/system/modules/core/library/Contao/Image.php
@@ -1288,20 +1288,20 @@ public static function get($image, $width, $height, $mode='', $target=null, $for
 			->setTargetPath($target)
 			->setForceOverride($force);
 
+		$fileRecord = \FilesModel::findByPath($image);
+		if ($fileRecord && $fileRecord->importantPartWidth && $fileRecord->importantPartHeight)
+		{
+			$imageObj->setImportantPart(array(
+				'x' => (int)$fileRecord->importantPartX,
+				'y' => (int)$fileRecord->importantPartY,
+				'width' => (int)$fileRecord->importantPartWidth,
+				'height' => (int)$fileRecord->importantPartHeight,
+			));
+		}
+
 		// Load the image size from the database if $mode is an id
 		if (is_numeric($mode) && $imageSize = \ImageSizeModel::findByPk($mode))
 		{
-			$fileRecord = \FilesModel::findByPath($image);
-			if ($fileRecord && $fileRecord->importantPartWidth && $fileRecord->importantPartHeight)
-			{
-				$imageObj->setImportantPart(array(
-					'x' => (int)$fileRecord->importantPartX,
-					'y' => (int)$fileRecord->importantPartY,
-					'width' => (int)$fileRecord->importantPartWidth,
-					'height' => (int)$fileRecord->importantPartHeight,
-				));
-			}
-
 			$imageObj->setTargetWidth($imageSize->width)
 				->setTargetHeight($imageSize->height)
 				->setResizeMode($imageSize->resizeMode)