From 088a86df3c9a60f6490fe571d7d6c671557c13b2 Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 6 Mar 2012 16:40:07 +0000 Subject: [PATCH] // Fix minor bug on shop urls #PSTEST-911 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13906 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index a7279c4e8..52de4ba9a 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1624,7 +1624,7 @@ class AdminControllerCore extends Controller Tools::redirectAdmin($this->context->link->getAdminLink('AdminLogin').(!isset($_GET['logout']) ? '&redirect='.$this->controller_name : '')); // Set current index - $current_index = $this->context->shop->getBaseURI().basename(_PS_ADMIN_DIR_).'/index.php'.(($controller = Tools::getValue('controller')) ? '?controller='.$controller : ''); + $current_index = __PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/index.php'.(($controller = Tools::getValue('controller')) ? '?controller='.$controller : ''); if ($back = Tools::getValue('back')) $current_index .= '&back='.urlencode($back); self::$currentIndex = $current_index;