// Fix displaying name of shop

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}

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,