From 3509b227a6ca4bdcae751bfe86212e05876a3bb2 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Wed, 10 Oct 2012 08:36:51 +0000
Subject: [PATCH] //small fix for retro compat on adminTab

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17815 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/functions.php  | 3 ++-
 admin-dev/header.inc.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index b343b5b9c..ce72fb038 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -410,6 +410,7 @@ function runAdminTab($tab, $ajaxMode = false)
 	// $tab = $_REQUEST['tab'];
 	if ($adminObj = checkingTab($tab))
 	{
+		Context::getContext()->controller = $adminObj;
 		// init is different for new tabs (AdminController) and old tabs (AdminTab)
 		if ($adminObj instanceof AdminController)
 		{
@@ -462,7 +463,7 @@ function runAdminTab($tab, $ajaxMode = false)
 				<a href="?token='.Tools::getAdminToken($tab.intval(Tab::getIdFromClassName($tab)).(int)Context::getContext()->employee->id).'">'.translate('Back Office').'</a>
 				'.$bread.'</div>';
 
-			if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL)
+			if (!$ajaxMode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
 			{
 				echo '<div class="multishop_info">';
 				if (Shop::getContext() == Shop::CONTEXT_GROUP)
diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index 9940f114f..8f2b272c4 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -341,7 +341,7 @@ echo '
 				if(defined('_PS_MODE_DEV_') && _PS_MODE_DEV_)
 					echo '<div class="warn">This tab is an AdminTab</div>';
 
-if (Shop::isFeatureActive())
+if (Shop::isFeatureActive() && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL)
 {
    echo '<div class="multishop_toolbar">
         <span class="text_multishop">'.translate('Multistore configuration for').'</span>'.