From c21c00f350d3dc6fe32743a80113fcec6fb0eec6 Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 23 Sep 2011 15:45:09 +0000
Subject: [PATCH] // fix tab display and subtabbing

---
 admin-dev/functions.php | 14 +++++++++-----
 classes/Tab.php         |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index 85d5b82ae..0b9b8a922 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -452,11 +452,15 @@ if ($adminObj = checkingTab($tab))
 		$tabs = array_reverse($tabs);
 		$bread = '';
 		foreach ($tabs AS $key => $item)
-			$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />
-			'.((sizeof($tabs) - 1 > $key)
-				? '<a href="?tab='.$item['class_name'].'&token='.Tools::getAdminToken($item['class_name'].intval($item['id_tab']).(int)Context::getContext()->employee->id).'">'
-				: '').'
-			'.$item['name'].((sizeof($tabs) - 1 > $key) ? '</a>' : '');
+		{
+			$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />';
+			if (count($tabs) - 1 > $key)
+				$bread .= '<a href="?tab='.$item['class_name'].'&token='.Tools::getAdminToken($item['class_name'].intval($item['id_tab']).(int)Context::getContext()->employee->id).'">';
+			
+			$bread .= $item['name'];
+			if (count($tabs) - 1 > $key)
+				$bread .= '</a>';
+		}
 		
 		// @TODO : a way to desactivate this feature
 		echo'<script type="text/javascript">
diff --git a/classes/Tab.php b/classes/Tab.php
index 66c59fe26..ebbde154b 100644
--- a/classes/Tab.php
+++ b/classes/Tab.php
@@ -259,7 +259,7 @@ class TabCore extends ObjectModel
 		$tabs[]= $adminTab;
 		if ($adminTab['id_parent'] > 0)
 		{
-			$tabs[] = Tab::recursiveTab($adminTab['id_parent'], $tabs);
+			$tabs = Tab::recursiveTab($adminTab['id_parent'], $tabs);
 		}
 		return $tabs;
 	}