From e531c743729fe4f5c07a4494d4c08f89f4d602d2 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Wed, 16 Nov 2011 21:27:03 +0000
Subject: [PATCH] // Fix change tab for controller of AdminQuickAccesses

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10187 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/header.tpl | 14 +++++++-------
 classes/AdminController.php          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl
index 3f0cc2929..0d219ad54 100644
--- a/admin-dev/themes/template/header.tpl
+++ b/admin-dev/themes/template/header.tpl
@@ -223,13 +223,13 @@ $(document).ready(function()
 		</div>
 		<div id="header_quick">
 		<script type="text/javascript">
-		function quickSelect(elt)
-		{
-			var eltVal = $(elt).val();
-			if (eltVal == "0") return false;
-			else if (eltVal.substr(eltVal.length - 6) == "_blank") window.open(eltVal.substr(0, eltVal.length - 6)+'&token={$token}', "_blank");
-			else location.href = eltVal+'&token={$token}';
-		}
+			function quickSelect(elt)
+			{
+				var eltVal = $(elt).val();
+				if (eltVal == "0") return false;
+				else if (eltVal.substr(eltVal.length - 6) == '_blank') window.open(eltVal.substr(0, eltVal.length - 6), '_blank');
+				else location.href = eltVal;
+			}
 		</script>
 		<select onchange="quickSelect(this);" id="quick_select">
 			<option value="0">{l s='Quick Access'}</option>
diff --git a/classes/AdminController.php b/classes/AdminController.php
index d0e12d775..dc4b47572 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1089,7 +1089,7 @@ class AdminControllerCore extends Controller
 		$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
 		foreach ($quick_access as $index => $quick)
 		{
-			preg_match('/tab=(.+)(&.+)?$/', $quick['link'], $admin_tab);
+			preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
 			if (isset($admin_tab[1]))
 			{
 				if (strpos($admin_tab[1], '&'))