// Replacing some "4 spaces" by a unique tabulation

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11587 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-22 12:43:31 +00:00
parent 8da11c4662
commit 520867e0fe
+2 -2
View File
@@ -151,12 +151,12 @@ class CartRuleCore extends ObjectModel
}
public static function getCustomerCartRules($id_lang, $id_customer, $active = false, $includeGeneric = true, $inStock = false, Cart $cart = null)
{
{
if (!CartRule::isFeatureActive())
return array();
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT *
SELECT *
FROM `'._DB_PREFIX_.'cart_rule` cr
LEFT JOIN `'._DB_PREFIX_.'cart_rule_lang` crl ON (cr.`id_cart_rule` = crl.`id_cart_rule` AND crl.`id_lang` = '.(int)$id_lang.')
WHERE (