From 9c8fbcb1a0251c5ba7a06306d663089bb6eebc62 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 10 Aug 2011 16:04:59 +0000
Subject: [PATCH] // Fix bug of toto on line 451 of carrier.php (he report
 modifications after change on signature function)

---
 classes/Carrier.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/classes/Carrier.php b/classes/Carrier.php
index b345577a8..8b9bed4d9 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -448,12 +448,9 @@ class CarrierCore extends ObjectModel
 	public static function getCarriersForOrder($id_zone, $groups = NULL)
 	{
 		$context = Context::getContext();
-		if (!$id_lang)
-			$id_lang = $context->language->id;
-		if (!$cart)
-			$cart = $context->cart;
-		if (!$id_currency)
-			$id_currency = $context->currency->id;
+		$id_lang = $context->language->id;
+		$cart = $context->cart;
+		$id_currency = $context->currency->id;
 
 		if (is_array($groups) AND !empty($groups))
 			$result = Carrier::getCarriers($id_lang, true, false, (int)$id_zone, $groups, self::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE);