From 7f6d1a17d0554badd64baffbb5466f9bf9892c4d Mon Sep 17 00:00:00 2001 From: dMetzger Date: Tue, 22 May 2012 11:54:54 +0000 Subject: [PATCH] [-] BO : Product filter initialization fixed in cart rules #PSCFV-2524 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15611 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminCartRulesController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index fa636bf6f..cec13a5f0 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -479,13 +479,13 @@ class AdminCartRulesControllerCore extends AdminController if (Validate::isUnsignedId($current_object->gift_product) && ($product = new Product($current_object->gift_product, false, $this->context->language->id)) && Validate::isLoadedObject($product)) - $gift_product_filter = trim($product->reference.' '.$product->name); + $gift_product_filter = (!empty($product->reference) ? $product->reference : $product->name); $reduction_product_filter = ''; if (Validate::isUnsignedId($current_object->reduction_product) && ($product = new Product($current_object->reduction_product, false, $this->context->language->id)) && Validate::isLoadedObject($product)) - $reduction_product_filter = trim($product->reference.' '.$product->name); + $reduction_product_filter = (!empty($product->reference) ? $product->reference : $product->name); $product_rule_groups = $this->getProductRuleGroupsDisplay($current_object);