From d004e0411e3f88a5508ed600b2cf6a7e7fc11a78 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 24 Sep 2013 08:17:46 +0200
Subject: [PATCH 1/2] remove smarty cache

---
 core/lib/Thelia/Core/Template/Smarty/SmartyParser.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index d76dd8dfa..f0cb6d8d4 100755
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -70,14 +70,8 @@ class SmartyParser extends Smarty implements ParserInterface
         $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.
-        if ($debug === false) {
-            $this->caching        = Smarty::CACHING_LIFETIME_CURRENT;
-            $this->cache_lifetime = 300;
-            $this->compile_check  = true;
-        } else {
-            $this->caching       = Smarty::CACHING_OFF;
-            $this->force_compile = true;
-        }
+        $this->caching       = Smarty::CACHING_OFF;
+        $this->force_compile = true;
 
         // The default HTTP status
         $this->status = 200;

From 9c80120383ab9d8b86161c8166c915b361df0934 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Wed, 25 Sep 2013 08:01:27 +0200
Subject: [PATCH 2/2] fix missing } in password template

---
 templates/default/password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/default/password.html b/templates/default/password.html
index 9168bd0a3..e332cdb0b 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -17,7 +17,7 @@
             {form name="thelia.customer.lostpassword"}
             <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"}
                 <div class="form-group group-email {if $error}has-error{elseif !$error && $value != ""}has-success{/if}">
                     <label for="{$label_attr.for}">{$label}</label>