// Fix multishop access when option is not enabled #PSCFV-2701

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15908 b9a71923-0436-4b27-9f14-aed3839534dd

controllers/admin/AdminShopController.php

@@ -76,6 +76,11 @@ class AdminShopControllerCore extends AdminController
 		parent::__construct();
 	}
 
+	public function viewAccess($disable = false)
+	{
+		return Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE');
+	}
+
 	public function initToolbar()
 	{
 		if (!$this->id_shop_group && $this->object && $this->object->id_shop_group)

controllers/admin/AdminShopGroupController.php

@@ -86,6 +86,11 @@ class AdminShopGroupControllerCore extends AdminController
 		parent::__construct();
 	}
 
+	public function viewAccess($disable = false)
+	{
+		return Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE');
+	}
+
 	public function initContent()
 	{
 		$this->list_simple_header = true;

controllers/admin/AdminShopUrlController.php

@@ -80,6 +80,11 @@ class AdminShopUrlControllerCore extends AdminController
 		parent::__construct();
 	}
 
+	public function viewAccess($disable = false)
+	{
+		return Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE');
+	}
+
 	public function renderList()
 	{
 		$this->addRowActionSkipList('delete', array(1));

install-dev/data/xml/tab.xml

@@ -243,7 +243,7 @@
     <tab id="E-mail" id_parent="Advanced_parameters" active="1">
       <class_name>AdminEmails</class_name>
     </tab>
-    <tab id="Multi-shop" id_parent="Advanced_parameters" active="1">
+    <tab id="Multi-shop" id_parent="Advanced_parameters" active="0">
       <class_name>AdminShopGroup</class_name>
     </tab>
     <tab id="CSV_Import" id_parent="Advanced_parameters" active="1">