Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-09-11 20:05:13 +02:00
parent f4f3084c35 e2dac03baa
commit 9fa6c86a94
3 changed files with 9 additions and 11 deletions
@@ -1190,7 +1190,7 @@ class CartRuleCore extends ObjectModel
 			SELECT cr.*, crl.*
 			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 code LIKE \'%'.pSQL($name).'%\'
+			WHERE code LIKE \'%'.pSQL($name).'%\' OR name LIKE \'%'.pSQL($name).'%\'
 		');
 	}
 }