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

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

Browse Source
This commit is contained in:
Jerome Nadaud committed 2013-11-13 10:58:01 +01:00
2 parents 6a99b84452 66a9ee03fc
commit 9f10a851e5
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/module/Module.php
+1 -1
View File
@@ -203,7 +203,7 @@ abstract class ModuleCore
} }
// Check PS version compliancy // Check PS version compliancy
if (version_compare(_PS_VERSION_, $this->ps_versions_compliancy['min']) < 0 || version_compare(_PS_VERSION_, $this->ps_versions_compliancy['max']) >= 0) if (version_compare(_PS_VERSION_, $this->ps_versions_compliancy['min']) < 0 || version_compare(_PS_VERSION_, $this->ps_versions_compliancy['max']) > 0)
{ {
$this->_errors[] = $this->l('The version of your module is not compliant with your PrestaShop version.'); $this->_errors[] = $this->l('The version of your module is not compliant with your PrestaShop version.');
return false; return false;
themes/default/contact-form.tpl
+1 -1
View File
@@ -88,7 +88,7 @@
<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option> <option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
{/foreach} {/foreach}
</select> </select>
{elseif !isset($customerThread.id_order) && !isset($isLogged)} {elseif !isset($customerThread.id_order) && empty($isLogged)}
<input type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" /> <input type="text" name="id_order" id="id_order" value="{if isset($customerThread.id_order) && $customerThread.id_order|intval > 0}{$customerThread.id_order|intval}{else}{if isset($smarty.post.id_order) && !empty($smarty.post.id_order)}{$smarty.post.id_order|intval}{/if}{/if}" />
{elseif $customerThread.id_order|intval > 0} {elseif $customerThread.id_order|intval > 0}
<input type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" /> <input type="text" name="id_order" id="id_order" value="{$customerThread.id_order|intval}" readonly="readonly" />