From 9c1cf108a52a137b89c2c3a0dd7f04609bb0b7df Mon Sep 17 00:00:00 2001 From: Francois Gaillard Date: Wed, 18 Jan 2012 09:33:34 +0000 Subject: [PATCH] // Norm corrections applied --- classes/Carrier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Carrier.php b/classes/Carrier.php index a6364da17..db8243b2b 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -456,7 +456,7 @@ class CarrierCore extends ObjectModel $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' SELECT cl.*,c.*, cl.`name` AS country, zz.`name` AS zone FROM `'._DB_PREFIX_.'country` c - LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = '.(int)($id_lang).') + LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (c.`id_country` = cl.`id_country` AND cl.`id_lang` = '.(int)$id_lang.') INNER JOIN (`'._DB_PREFIX_.'carrier_zone` cz INNER JOIN `'._DB_PREFIX_.'carrier` cr ON ( cr.id_carrier = cz.id_carrier AND cr.deleted = 0 '. ($active_carriers ? 'AND cr.active = 1) ' : ') ').' LEFT JOIN `'._DB_PREFIX_.'zone` zz ON cz.id_zone = zz.id_zone) ON zz.`id_zone` = c.`id_zone`