From e28de3094ca9ec89da700c111ab003305b721dfe Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Tue, 22 May 2012 13:16:41 +0000
Subject: [PATCH] // Oups

---
 classes/CartRule.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/CartRule.php b/classes/CartRule.php
index fa378e7de..6e3ab8429 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -969,12 +969,12 @@ class CartRuleCore extends ObjectModel
 
 	public static function autoRemoveFromCart($context = null)
 	{
+		if (!$context)
+			$context = Context::getContext();
 		if (!CartRule::isFeatureActive() || !Validate::isLoadedObject($context->cart))
 			return array();
 
 		$errors = array();
-		if (!$context)
-			$context = Context::getContext();
 		foreach ($context->cart->getCartRules() as $cart_rule)
 		{
 			if ($error = $cart_rule['obj']->checkValidity($context, true))