From dde5fbb33e461a800c6332527b4391e07da81d2f Mon Sep 17 00:00:00 2001 From: bMancone Date: Wed, 7 Mar 2012 16:23:35 +0000 Subject: [PATCH] // Fixed combinations import git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13936 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminImportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 3d0e1d9af..faefd11a6 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1440,7 +1440,7 @@ class AdminImportControllerCore extends AdminController foreach ($attribute_combinations as $attribute_combination) { - if (in_array($id_product_attribute, $attribute_combination)) + if ($id_product_attribute && in_array($id_product_attribute, $attribute_combination)) { $product->updateAttribute( $id_product_attribute,