TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/thelia/thelia into coupon

Browse Source 
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  fix missing } in password template
  remove smarty cache
This commit is contained in:
gmorel
2013-09-26 17:48:06 +02:00
parent fbf7ee1625 9c80120383
commit a1f898ff3b
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
View File

@@ -70,14 +70,8 @@ class SmartyParser extends Smarty implements ParserInterface
$this->error_reporting = E_ALL ^ E_NOTICE; $this->error_reporting = E_ALL ^ E_NOTICE;
// Si on n'est pas en mode debug, activer le cache, avec une lifetime de 15mn, et en vérifiant que les templates sources n'ont pas été modifiés. // Si on n'est pas en mode debug, activer le cache, avec une lifetime de 15mn, et en vérifiant que les templates sources n'ont pas été modifiés.
if ($debug === false) { $this->caching = Smarty::CACHING_OFF;
$this->caching = Smarty::CACHING_LIFETIME_CURRENT; $this->force_compile = true;
$this->cache_lifetime = 300;
$this->compile_check = true;
} else {
$this->caching = Smarty::CACHING_OFF;
$this->force_compile = true;
}
// The default HTTP status // The default HTTP status
$this->status = 200; $this->status = 200;

2
templates/default/password.html
View File

@@ -17,7 +17,7 @@
{form name="thelia.customer.lostpassword"} {form name="thelia.customer.lostpassword"}
<form id="form-forgotpassword" action="{url path="/password"}" method="post" role="form"> <form id="form-forgotpassword" action="{url path="/password"}" method="post" role="form">
<p>{intl l="Please enter your email address below." {intl l="You will receive a link to reset your password."}</p> <p>{intl l="Please enter your email address below."} {intl l="You will receive a link to reset your password."}</p>
{form_field form=$form field="email"} {form_field form=$form field="email"}
<div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}"> <div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}">
<label for="{$label_attr.for}">{$label}</label> <label for="{$label_attr.for}">{$label}</label>