From 7bb50bbea3de05aa59d8470fc661e7c3c30d30c7 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Wed, 23 Nov 2011 09:35:30 +0000
Subject: [PATCH] // Fix displaying name of shop

---
 admin-dev/themes/template/header.tpl | 4 ++--
 classes/AdminController.php          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/template/header.tpl b/admin-dev/themes/template/header.tpl
index 7b6110512..ac397ab5a 100644
--- a/admin-dev/themes/template/header.tpl
+++ b/admin-dev/themes/template/header.tpl
@@ -275,9 +275,9 @@ $(document).ready(function()
 		{if $is_multishop && $shop_context != 'all'}
 			<div class="multishop_info">
 				{if $shop_context == 'group'}
-					{l s='You are configuring your store for group shop '}<b>{$shop_name}</b>
+					{l s='You are configuring your store for group shop '}<b>{$group_shop->name}</b>
 				{elseif $shop_context == 'shop'}
-					{l s='You are configuring your store for shop '}<b>{$shop_name}</b>
+					{l s='You are configuring your store for shop '}<b>{$shop->name}</b>
 				{/if}
 			</div>
 		{/if}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index a54765d67..5e8ede003 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1239,6 +1239,8 @@ class AdminControllerCore extends Controller
 			'quick_access' => $quick_access,
 			'multi_shop' => Shop::isFeatureActive(),
 			'shop_list' => (Shop::isFeatureActive() ? generateShopList() : null), //@TODO refacto
+			'shop' => $this->context->shop,
+			'group_shop' => $this->context->shop->getGroup(),
 			'tab' => $tab,
 			'current_parent_id' => (int)Tab::getCurrentParentId(),
 			'tabs' => $tabs,