Index: branches/RC/core/units/general/helpers/image_helper.php
===================================================================
diff -u -N -r10369 -r10638
--- branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 10369)
+++ branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 10638)
@@ -92,7 +92,7 @@
 				return false;
 			}*/
 
-			if (function_exists('imagecreatefromjpeg')) {
+			if (!$this->Application->ConfigValue('ForceImageMagickResize') && function_exists('imagecreatefromjpeg')) {
 				// try to resize using GD
 				$resize_map = Array (
 					'image/jpeg' => 'imagecreatefromjpeg:imagejpeg:jpg',