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

2013-08-22 12:31:28 +00:00
parent 5faaef9f21 4de8013b5e
commit 47827a1a1b
12 changed files with 54 additions and 39 deletions
@@ -718,7 +718,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 			&& (!isset($logo['error']) || !$logo['error'])
 			&& preg_match('/\.(jpe?g|gif|png)$/', $logo['name'])
 			&& is_uploaded_file($logo['tmp_name'])
-			&& ImageManager::isRealImage($logo['tmp_name']))
+			&& ImageManager::isRealImage($logo['tmp_name'], $logo['type']))
 		{
 			$file = $logo['tmp_name'];
 			do $tmp_name = uniqid().'.jpg';