Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

2012-12-18 16:14:26 +01:00
parent f07b96f3d8 49c3a3ab29
commit b390a51333
1 changed files with 1 additions and 1 deletions
@@ -422,7 +422,7 @@ class ImageManagerCore
 		$types = array(
 						'image/gif' => array('gif'),
 						'image/jpeg' => array('jpg', 'jpeg'),
-						'image/png' => array('jpg', 'png')
+						'image/png' => array('png')
 					);	
 		$extension = substr($file_name, strrpos($file_name, '.') + 1);