From cfd6918b70089baadd4d14b01ce803e50b4e7897 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 21 Dec 2011 17:43:34 +0000
Subject: [PATCH] // Fix smarty variable conflict

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11531 b9a71923-0436-4b27-9f14-aed3839534dd
---
 modules/cheque/cheque.php            | 5 ++---
 modules/cheque/payment_execution.tpl | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php
index e267a276b..74da5549c 100644
--- a/modules/cheque/cheque.php
+++ b/modules/cheque/cheque.php
@@ -214,7 +214,6 @@ class Cheque extends PaymentModule
 		$cart = $this->context->cart;
 		if (!$this->_checkCurrency($cart))
 			Tools::redirect('index.php?controller=order');
-
 		$this->context->smarty->assign(array(
 			'nbProducts' => $cart->nbProducts(),
 			'cust_currency' => $cart->id_currency,
@@ -223,8 +222,8 @@ class Cheque extends PaymentModule
 			'isoCode' => $this->context->language->iso_code,
 			'chequeName' => $this->chequeName,
 			'chequeAddress' => Tools::nl2br($this->address),
-			'this_path' => $this->_path,
-			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
+			'cheque_path' => $this->_path,
+			'cheque_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
 		));
 
 		if (!$direct_call)
diff --git a/modules/cheque/payment_execution.tpl b/modules/cheque/payment_execution.tpl
index fab36e35b..a95d9cc57 100644
--- a/modules/cheque/payment_execution.tpl
+++ b/modules/cheque/payment_execution.tpl
@@ -39,7 +39,7 @@
 <h3>{l s='Cheque payment' mod='cheque'}</h3>
 <form action="{$link->getModuleLink('cheque', 'validation', true)}" method="post">
 	<p>
-		<img src="{$this_path}cheque.jpg" alt="{l s='cheque' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
+		<img src="{$cheque_path}cheque.jpg" alt="{l s='cheque' mod='cheque'}" width="86" height="49" style="float:left; margin: 0px 10px 5px 0px;" />
 		{l s='You have chosen to pay by cheque.' mod='cheque'}
 		<br/><br />
 		{l s='Here is a short summary of your order:' mod='cheque'}