From c847c68f4997879db6916d2a2b6cc18d46fac494 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 21 Sep 2012 13:40:41 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-4131 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17461 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminImportController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 3ed4ba7bd..3733b23dd 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1455,10 +1455,13 @@ class AdminImportControllerCore extends AdminController AdminImportController::setDefaultValues($info); + if (!Shop::isFeatureActive()) + $info['shop'] = 1; + elseif (!isset($info['shop']) || empty($info['shop'])) + $info['shop'] = implode($this->multiple_value_separator, Shop::getContextListShopID()); + // Get shops for each attributes $info['shop'] = explode($this->multiple_value_separator, $info['shop']); - if (!isset($info['shop']) || !count($info['shop'])) - $info['shop'] = Shop::getContextListShopID(); $id_shop_list = array(); foreach ($info['shop'] as $shop)