From cbdea59753f1108578a086f45ddba76bbbd78481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 8 Aug 2013 11:50:35 +0200 Subject: [PATCH] // revert 1c80b5fdfe8bf6c2f0b75689b15445cf44a4d1b0 --- controllers/admin/AdminCarrierWizardController.php | 3 ++- controllers/admin/AdminProductsController.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php index 0b8eeea69..a35ffe46d 100644 --- a/controllers/admin/AdminCarrierWizardController.php +++ b/controllers/admin/AdminCarrierWizardController.php @@ -717,7 +717,8 @@ class AdminCarrierWizardControllerCore extends AdminController if ($logo && !empty($logo['tmp_name']) && $logo['tmp_name'] != 'none' && (!isset($logo['error']) || !$logo['error']) && preg_match('/\.(jpe?g|gif|png)$/', $logo['name']) - && is_uploaded_file($logo['tmp_name'])) + && is_uploaded_file($logo['tmp_name']) + && ImageManager::isRealImage($logo['tmp_name'])) { $file = $logo['tmp_name']; do $tmp_name = uniqid().'.jpg'; diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 0ea255a48..541b89f26 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -3579,7 +3579,7 @@ class AdminProductsControllerCore extends AdminController protected function getCarrierList() { - $carrier_list = Carrier::getCarriers($this->context->language->id, true, false, false, null, Carrier::ALL_CARRIERS); + $carrier_list = Carrier::getCarriers($this->context->language->id, false, false, false, null, Carrier::ALL_CARRIERS); if ($product = $this->loadObject(true)) { $carrier_selected_list = $product->getCarriers();