From 1b010da64f9e5ce94194e54de71264595695e1f3 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 25 Sep 2013 20:21:41 +0200
Subject: [PATCH] // Fixed typo and configuration parse error

---
 .../themes/default/template/controllers/cart_rules/form.tpl | 6 +++---
 classes/Configuration.php                                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 		<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
 		<fieldset id="cart_rule_informations" class="cart_rule_tab">
-			<h3>{l s='Cart-rule information'}</h3>
+			<h3>{l s='Cart rule information'}</h3>
 			{include file='controllers/cart_rules/informations.tpl'}
 		</fieldset>
 		<fieldset id="cart_rule_conditions" class="cart_rule_tab">
-			<h3>{l s='Cart-rule conditions'}</h3>
+			<h3>{l s='Cart rule conditions'}</h3>
 			{include file='controllers/cart_rules/conditions.tpl'}
 		</fieldset>
 		<fieldset id="cart_rule_actions" class="cart_rule_tab">
-			<h3>{l s='Cart-rule actions'}</h3>
+			<h3>{l s='Cart rule actions'}</h3>
 			{include file='controllers/cart_rules/actions.tpl'}
 		</fieldset>
 		<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn"><i class="icon-save"></i> {l s='Save'}</button>
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).'"
 		)');