// 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
This commit is contained in:
1 parent
f562effdbd
commit
e15452ce61
1 file changed
+5
@@ -1212,6 +1212,10 @@ class AdminControllerCore extends Controller
|
|||||||
// Quick access
|
// Quick access
|
||||||
$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
|
$quick_access = QuickAccess::getQuickAccesses($this->context->language->id);
|
||||||
foreach ($quick_access as $index => $quick)
|
foreach ($quick_access as $index => $quick)
|
||||||
|
{
|
||||||
|
if ($quick['link'] == '../' && Context::shop() == Shop::CONTEXT_SHOP)
|
||||||
|
$quick_access[$index]['link'] = $this->context->shop->getBaseURL();
|
||||||
|
else
|
||||||
{
|
{
|
||||||
preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
|
preg_match('/controller=(.+)(&.+)?$/', $quick['link'], $admin_tab);
|
||||||
if (isset($admin_tab[1]))
|
if (isset($admin_tab[1]))
|
||||||
@@ -1223,6 +1227,7 @@ class AdminControllerCore extends Controller
|
|||||||
$quick_access[$index]['link'] .= '&token='.$token;
|
$quick_access[$index]['link'] .= '&token='.$token;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Tab list
|
// Tab list
|
||||||
$tabs = Tab::getTabs($this->context->language->id, 0);
|
$tabs = Tab::getTabs($this->context->language->id, 0);
|
||||||
|
|||||||
Reference in new issue
Block a user