From 5a8c335d785bdde9d3371a57f0e3d414a807fcac Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Wed, 13 Nov 2013 12:30:39 +0100
Subject: [PATCH] [-] FO : Bad value for back when controller name is sent

---
 controllers/front/AuthController.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 5dc783a19..1c79df707 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -87,12 +87,15 @@ class AuthControllerCore extends FrontController
 
 		$this->context->smarty->assign('newsletter', 1);
 
-		$back = Tools::getValue('back');
-		$key = Tools::safeOutput(Tools::getValue('key'));
-		if (!empty($key))
-			$back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key;
-		if (!empty($back))
-			$this->context->smarty->assign('back', Tools::safeOutput(Tools::secureReferrer($back)));
+		if ($back = Tools::safeOutput(Tools::getValue('back')))
+		{
+			$key = Tools::safeOutput(Tools::getValue('key'));
+			if (!empty($key))
+				$back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key;
+			if ($back == Tools::secureReferrer(Tools::getValue('back')))
+				$this->context->smarty->assign('back', html_entity_decode($back));
+			$this->context->smarty->assign('back', $back);
+		}
 	
 		if (Tools::getValue('display_guest_checkout'))
 		{