Merge remote-tracking branch 'origin/master'

1 files changed, 29 insertions, 3 deletions

diff --git a/tbl_chart.php b/tbl_chart.php
index 4585756943..faf79b3e04 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -29,9 +29,23 @@ $GLOBALS['js_include'][] = 'canvg/rgbcolor.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';
+}
 
 /*
  * Execute the query and return the result
@@ -49,12 +63,24 @@ if (PMA_isValid($_REQUEST['chartSettings'], 'array')) {
     $chartSettings = $_REQUEST['chartSettings'];
 }
 
+<<<<<<< HEAD
 /**
  * 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';
+=======
+// get the chart and settings after chart generation
+$chart = PMA_chart_results($data, $chartSettings);
+
+if (!empty($chart)) {
+    $message = PMA_Message::success(__('Chart generated successfully.'));
+}
+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]'));
+}
+>>>>>>> origin/master
 
 $url_params['db'] = $GLOBALS['db'];
 $url_params['reload'] = 1;