[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-41-g4fe4646

[? sunnavy]

The branch, 3.8-trunk has been updated
       via  4fe46463daa743db38ab8e582b2fa7e3e42a16c9 (commit)
      from  f670bf8f2a893352ed0ba29f7af814e747f04c26 (commit)

Summary of changes:
 share/html/Admin/Elements/SystemTabs |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 4fe46463daa743db38ab8e582b2fa7e3e42a16c9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 13 18:08:28 2010 +0800

    use empty hash instead to get rid of circular references: see #14853 for details

diff --git a/share/html/Admin/Elements/SystemTabs b/share/html/Admin/Elements/SystemTabs
index 4a20dab..8d9668b 100755
--- a/share/html/Admin/Elements/SystemTabs
+++ b/share/html/Admin/Elements/SystemTabs
@@ -76,16 +76,13 @@
 
 };
 
-# Use current $tabs as $subtabs if there is no $subtabs for this tab
-$subtabs = ($subtabs) ? $subtabs : $tabs;
-
   # Now let callbacks add their extra tabs
   $m->callback( %ARGS, tabs => $tabs );
 
   if ($current_tab) {
     foreach my $tab (sort keys %{$tabs}) {
       if ($tabs->{$tab}->{'path'} eq $current_tab) {
-        $tabs->{$tab}->{"subtabs"} = $subtabs;
+        $tabs->{$tab}->{"subtabs"} = $subtabs || {};
         $tabs->{$tab}->{"current_subtab"} = $current_subtab;
       }
     }

-----------------------------------------------------------------------