From e15452ce61bb509ba73bbeae142bab3090c5e1ea Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 13 Feb 2012 17:22:12 +0000 Subject: [PATCH] // Fix quick link access for multishop #PSFV-478 #PSTEST-687 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13272 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 1e5215909..1ef381eb3 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1213,14 +1213,19 @@ class AdminControllerCore extends Controller $quick_access = QuickAccess::getQuickAccesses($this->context->language->id); foreach ($quick_access as $index => $quick) { - preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab); - if (isset($admin_tab[1])) + if ($quick['link'] == '../' && Context::shop() == Shop::CONTEXT_SHOP) + $quick_access[$index]['link'] = $this->context->shop->getBaseURL(); + else { - if (strpos($admin_tab[1], '&')) - $admin_tab[1] = substr($admin_tab[1], 0, strpos($admin_tab[1], '&')); + preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab); + if (isset($admin_tab[1])) + { + if (strpos($admin_tab[1], '&')) + $admin_tab[1] = substr($admin_tab[1], 0, strpos($admin_tab[1], '&')); - $token = Tools::getAdminToken($admin_tab[1].(int)Tab::getIdFromClassName($admin_tab[1]).(int)$this->context->employee->id); - $quick_access[$index]['link'] .= '&token='.$token; + $token = Tools::getAdminToken($admin_tab[1].(int)Tab::getIdFromClassName($admin_tab[1]).(int)$this->context->employee->id); + $quick_access[$index]['link'] .= '&token='.$token; + } } }