dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// revert 1c80b5fdfe

Browse Source
This commit is contained in:
Rémi Gaillard
2013-08-08 11:50:35 +02:00
parent 5832ab3eb5
commit cbdea59753
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+2 -1
View File
@@ -717,7 +717,8 @@ class AdminCarrierWizardControllerCore extends AdminController
if ($logo && !empty($logo['tmp_name']) && $logo['tmp_name'] != 'none' if ($logo && !empty($logo['tmp_name']) && $logo['tmp_name'] != 'none'
&& (!isset($logo['error']) || !$logo['error']) && (!isset($logo['error']) || !$logo['error'])
&& preg_match('/\.(jpe?g|gif|png)$/', $logo['name']) && 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']; $file = $logo['tmp_name'];
do $tmp_name = uniqid().'.jpg'; do $tmp_name = uniqid().'.jpg';
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -3579,7 +3579,7 @@ class AdminProductsControllerCore extends AdminController
protected function getCarrierList() 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)) if ($product = $this->loadObject(true))
{ {
$carrier_selected_list = $product->getCarriers(); $carrier_selected_list = $product->getCarriers();