diff --git a/db_tracking.php b/db_tracking.php index f69ea41aed..4077f75748 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -57,11 +57,6 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) { // --------------------------------------------------------------------------- -/* - * Display top menu links - */ -require_once 'libraries/db_links.inc.php'; - // Prepare statement to get HEAD version $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' . diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 5d1efc2ed8..ab9a278cb7 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -283,10 +283,10 @@ if (! isset($total_num_tables)) { unset($each_table, $tbl_group_sql, $db_info_result); /** - * Displays top menu links - * If in an Ajax request, we do not need to show this + * If coming from a Show MySQL link on the home page, + * put something in $sub_part */ -if ($GLOBALS['is_ajax_request'] != true) { - include './libraries/db_links.inc.php'; +if (empty($sub_part)) { + $sub_part = '_structure'; } ?> diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php deleted file mode 100644 index 15af9c36bc..0000000000 --- a/libraries/db_links.inc.php +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/view_create.php b/view_create.php index eb2bb5cee9..385890c2f5 100644 --- a/view_create.php +++ b/view_create.php @@ -93,14 +93,6 @@ if (PMA_isValid($_REQUEST['view'], 'array')) { $view = array_merge($view, $_REQUEST['view']); } -/** - * Displays top menu links - * We use db links because a VIEW is not necessarily on a single table - */ -$num_tables = 0; -if ($GLOBALS['is_ajax_request'] != true) { - include_once './libraries/db_links.inc.php'; -} $url_params['db'] = $GLOBALS['db']; $url_params['reload'] = 1;