diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index 477af2bb0..d58678f19 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -25,15 +25,15 @@ {if $currentObject->id}{/if}
-

{l s='Cart-rule information'}

+

{l s='Cart rule information'}

{include file='controllers/cart_rules/informations.tpl'}
-

{l s='Cart-rule conditions'}

+

{l s='Cart rule conditions'}

{include file='controllers/cart_rules/conditions.tpl'}
-

{l s='Cart-rule actions'}

+

{l s='Cart rule actions'}

{include file='controllers/cart_rules/actions.tpl'}
diff --git a/classes/Configuration.php b/classes/Configuration.php index ae7f7d2f0..dc623e3f0 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -391,8 +391,8 @@ class ConfigurationCore extends ObjectModel $result = Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'_lang` - WHERE ``'.bqSQL(self::$definition['primary']).'`` IN ( - SELECT ``'.bqSQL(self::$definition['primary']).'`` + WHERE `'.bqSQL(self::$definition['primary']).'` IN ( + SELECT `'.bqSQL(self::$definition['primary']).'` FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'` WHERE `name` = "'.pSQL($key).'" )');