From 27dd4be97d66877e7cf90b87a0dc03a90e8fa7a7 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Mon, 5 Mar 2012 13:25:30 +0000
Subject: [PATCH] // remove $noTabLink from compatibility tabs

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13835 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/functions.php  | 1 -
 admin-dev/header.inc.php | 4 ----
 classes/AdminTab.php     | 5 -----
 3 files changed, 10 deletions(-)

diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index 44518a376..9a9dae11a 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -453,7 +453,6 @@ function runAdminTab($tab, $ajaxMode = false)
 	// $tab = $_REQUEST['tab'];
 	if ($adminObj = checkingTab($tab))
 	{
-		$noTabLink = $adminObj->noTabLink;
 		// init is different for new tabs (AdminController) and old tabs (AdminTab)
 		if ($adminObj instanceof AdminController)
 		{
diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php
index 41f8e7b33..421348273 100644
--- a/admin-dev/header.inc.php
+++ b/admin-dev/header.inc.php
@@ -311,10 +311,6 @@ foreach ($tabs AS $t)
 			<ul class="submenu">';
 		$subTabs = Tab::getTabs(Context::getContext()->language->id, (int)$t['id_tab']);
 
-		// @todo need a better way than using noTabLink property, keeping the fact to avoid db modification
-		if (!in_array($t['class_name'], $noTabLink))
-			array_unshift($subTabs, $t);
-
 		foreach ($subTabs AS $t2)
 			if (checkTabRights($t2['id_tab']) === true AND (bool)$t2['active'])
 				echo '<li><a href="index.php?controller='.$t2['class_name'].'&token='.Tools::getAdminTokenLite($t2['class_name']).'">'.$t2['name'].'</a></li>';
diff --git a/classes/AdminTab.php b/classes/AdminTab.php
index fcf353534..7a556f628 100644
--- a/classes/AdminTab.php
+++ b/classes/AdminTab.php
@@ -190,8 +190,6 @@ abstract class AdminTabCore
 	public $ignore_sleep = false;
 
 	public static $tabParenting = array(
-//		'AdminProducts' => 'AdminCatalog',
-//		'AdminCategories' => 'AdminCatalog',
 		'AdminCms' => 'AdminCmsContent',
 		'AdminCmsCategories' => 'AdminCmsContent',
 		'AdminOrdersStates' => 'AdminStatuses',
@@ -202,9 +200,6 @@ abstract class AdminTabCore
 		'AdminStatsTab' => 'AdminStats'
 	);
 
-	/** @var array noTabLink array of admintabs with no content */
-	public $noTabLink = array('AdminCatalog', 'AdminPriceRule', 'AdminTools', 'AdminStock', 'AdminAdmin');
-
 	public function __construct()
 	{
 		$this->context = Context::getContext();