From 51b6aba6f4d091ddf4aa29f83cc8b42689661e85 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Mon, 15 Oct 2012 15:31:04 +0000
Subject: [PATCH] [-] FO: Fix #PSCFV-4814 cart rule not combinables

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17864 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/CartRule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index a7cd40878..11fac7811 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -536,7 +536,7 @@ class CartRuleCore extends ObjectModel
 					OR (id_cart_rule_2 = '.(int)$this->id.' AND id_cart_rule_1 = '.(int)$otherCartRule['id_cart_rule'].')');
 					if (!$combinable)
 					{
-						$cart_rule = new CartRule($otherCartRule['cart_rule_restriction'], $context->cart->id_lang);
+						$cart_rule = new CartRule((int)$otherCartRule['id_cart_rule'], $context->cart->id_lang);
 						// The cart rules are not combinable and the cart rule currently in the cart has priority over the one tested
 						if ($cart_rule->priority <= $this->priority)
 							return (!$display_error) ? false : Tools::displayError('This voucher is not combinable with an other voucher already in your cart:').' '.$cart_rule->name;