From 65a16aa3a73602bc866e247e707be300451f3232 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 6 Mar 2012 16:39:02 +0000
Subject: [PATCH] // Fix minor bug on shop urls #PSTEST-911

---
 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 c1154c674..a7279c4e8 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 = dirname($_SERVER['SCRIPT_NAME']).'/index.php'.(($controller = Tools::getValue('controller')) ? '?controller='.$controller : '');
+		$current_index = $this->context->shop->getBaseURI().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;