From 7b4de2882cc4bab0468ecc85feb551d16d953fdf Mon Sep 17 00:00:00 2001 From: rGaillard Date: Thu, 9 Aug 2012 16:31:50 +0000 Subject: [PATCH] [-] FO: Fix #PSCFV-3572 bad redirect link on order with account creation git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16786 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/OrderController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index b706f31db..70d2bdd82 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -63,9 +63,8 @@ class OrderControllerCore extends ParentOrderController Tools::displayPrice($minimal_purchase, $currency) ); } - if (!$this->context->customer->isLogged(true) && in_array($this->step, array(1, 2, 3))) - Tools::redirect('index.php?controller=authentication&back='.urlencode('order.php&step='.$this->step.'&multi-shipping='.(int)Tools::getValue('multi-shipping')).'&multi-shipping='.(int)Tools::getValue('multi-shipping')); + Tools::redirect($this->context->link->getPageLink('authentication', true, (int)$this->context->language->id, 'back='.$this->context->link->getPageLink('order', true, (int)$this->context->language->id, 'step='.$this->step.'&multi-shipping='.(int)Tools::getValue('multi-shipping')).'&multi-shipping='.(int)Tools::getValue('multi-shipping'))); if (Tools::getValue('multi-shipping') == 1) $this->context->smarty->assign('multi_shipping', true);