dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fixed typo and configuration parse error

Browse Source
This commit is contained in:
Damien Metzger committed 2013-09-25 20:21:41 +02:00
1 parent fd1cfe0c8c
commit 1b010da64f
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+3 -3
View File
@@ -25,15 +25,15 @@
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if} {if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" /> <input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
<fieldset id="cart_rule_informations" class="cart_rule_tab"> <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'} {include file='controllers/cart_rules/informations.tpl'}
</fieldset> </fieldset>
<fieldset id="cart_rule_conditions" class="cart_rule_tab"> <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'} {include file='controllers/cart_rules/conditions.tpl'}
</fieldset> </fieldset>
<fieldset id="cart_rule_actions" class="cart_rule_tab"> <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'} {include file='controllers/cart_rules/actions.tpl'}
</fieldset> </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> <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>
classes/Configuration.php
+2 -2
View File
@@ -391,8 +391,8 @@ class ConfigurationCore extends ObjectModel
$result = Db::getInstance()->execute(' $result = Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'_lang` DELETE FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'_lang`
WHERE ``'.bqSQL(self::$definition['primary']).'`` IN ( WHERE `'.bqSQL(self::$definition['primary']).'` IN (
SELECT ``'.bqSQL(self::$definition['primary']).'`` SELECT `'.bqSQL(self::$definition['primary']).'`
FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'` FROM `'._DB_PREFIX_.bqSQL(self::$definition['table']).'`
WHERE `name` = "'.pSQL($key).'" WHERE `name` = "'.pSQL($key).'"
)'); )');