From ca6f3b0ac27ab2124c196dda8484397d99656e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Mon, 13 Jun 2011 14:50:07 +0200
Subject: [PATCH] Display tabs for chart based on currently selected
 database/table

---
 tbl_chart.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/tbl_chart.php b/tbl_chart.php
index f4b8bd3adb..5853c458e9 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -24,9 +24,23 @@ $GLOBALS['js_include'][] = 'pMap.js';
 /**
  * Runs common work
  */
-require './libraries/db_common.inc.php';
-$url_params['goto'] = $cfg['DefaultTabDatabase'];
-$url_params['back'] = 'sql.php';
+if (strlen($GLOBALS['table'])) {
+    $url_params['goto'] = $cfg['DefaultTabTable'];
+    $url_params['back'] = 'tbl_sql.php';
+    require './libraries/tbl_common.php';
+    require './libraries/tbl_info.inc.php';
+    require './libraries/tbl_links.inc.php';
+} elseif (strlen($GLOBALS['db'])) {
+    $url_params['goto'] = $cfg['DefaultTabDatabase'];
+    $url_params['back'] = 'sql.php';
+    require './libraries/db_common.inc.php';
+    require './libraries/db_info.inc.php';
+} else {
+    $url_params['goto'] = $cfg['DefaultTabServer'];
+    $url_params['back'] = 'sql.php';
+    require './libraries/server_common.inc.php';
+    require './libraries/server_links.inc.php';
+}
 
 /*
  * Import chart functions
@@ -59,13 +73,6 @@ else {
     $message = PMA_Message::error(__('The result of this query can\'t be used for a chart. See [a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]'));
 }
 
-/**
- * Displays top menu links
- * We use db links because a chart is not necessarily on a single table
- */
-$num_tables = 0;
-require_once './libraries/db_links.inc.php';
-
 $url_params['db'] = $GLOBALS['db'];
 $url_params['reload'] = 1;