diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 860d3d805..3701cbc63 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -118,20 +118,22 @@ $tabs = array(); $tabs[] =& $tab_structure; $tabs[] =& $tab_sql; $tabs[] =& $tab_search; -if (PMA_Tracker::isActive()) { - $tabs[] =& $tab_tracking; -} $tabs[] =& $tab_qbe; $tabs[] =& $tab_export; if (! $db_is_information_schema) { $tabs[] =& $tab_import; - if ($cfgRelation['designerwork']) { - $tabs[] =& $tab_designer; - } $tabs[] =& $tab_operation; if ($is_superuser) { $tabs[] =& $tab_privileges; } +} +if (PMA_Tracker::isActive()) { + $tabs[] =& $tab_tracking; +} +if (! $db_is_information_schema) { + if ($cfgRelation['designerwork']) { + $tabs[] =& $tab_designer; + } if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) { $tabs[] =& $tab_drop; } diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index ce6d83e52..5cd7a67b0 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -47,6 +47,29 @@ $tabs['status']['icon'] = 's_status.png'; $tabs['status']['link'] = 'server_status.php'; $tabs['status']['text'] = __('Status'); +if (! empty($binary_logs)) { + $tabs['binlog']['icon'] = 's_tbl.png'; + $tabs['binlog']['link'] = 'server_binlog.php'; + $tabs['binlog']['text'] = __('Binary log'); +} +$tabs['process']['icon'] = 's_process.png'; +$tabs['process']['link'] = 'server_processlist.php'; +$tabs['process']['text'] = __('Processes'); + +if ($is_superuser) { + $tabs['rights']['icon'] = 's_rights.png'; + $tabs['rights']['link'] = 'server_privileges.php'; + $tabs['rights']['text'] = __('Privileges'); +} + +$tabs['export']['icon'] = 'b_export.png'; +$tabs['export']['link'] = 'server_export.php'; +$tabs['export']['text'] = __('Export'); + +$tabs['import']['icon'] = 'b_import.png'; +$tabs['import']['link'] = 'server_import.php'; +$tabs['import']['text'] = __('Import'); + $tabs['vars']['icon'] = 's_vars.png'; $tabs['vars']['link'] = 'server_variables.php'; $tabs['vars']['text'] = __('Variables'); @@ -60,32 +83,11 @@ $tabs['engine']['link'] = 'server_engines.php'; $tabs['engine']['text'] = __('Engines'); if ($is_superuser) { - $tabs['rights']['icon'] = 's_rights.png'; - $tabs['rights']['link'] = 'server_privileges.php'; - $tabs['rights']['text'] = __('Privileges'); - $tabs['replication']['icon'] = 's_replication.png'; $tabs['replication']['link'] = 'server_replication.php'; $tabs['replication']['text'] = __('Replication'); } -if (! empty($binary_logs)) { - $tabs['binlog']['icon'] = 's_tbl.png'; - $tabs['binlog']['link'] = 'server_binlog.php'; - $tabs['binlog']['text'] = __('Binary log'); -} -$tabs['process']['icon'] = 's_process.png'; -$tabs['process']['link'] = 'server_processlist.php'; -$tabs['process']['text'] = __('Processes'); - -$tabs['export']['icon'] = 'b_export.png'; -$tabs['export']['link'] = 'server_export.php'; -$tabs['export']['text'] = __('Export'); - -$tabs['import']['icon'] = 'b_import.png'; -$tabs['import']['link'] = 'server_import.php'; -$tabs['import']['text'] = __('Import'); - $tabs['synchronize']['icon'] = 's_sync.png'; $tabs['synchronize']['link'] = 'server_synchronize.php'; $tabs['synchronize']['text'] = __('Synchronize'); diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index ef612933c..c89faabc2 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -61,13 +61,6 @@ $tabs['search']['icon'] = 'b_search.png'; $tabs['search']['text'] = __('Search'); $tabs['search']['link'] = 'tbl_select.php'; -if(PMA_Tracker::isActive()) -{ - $tabs['tracking']['icon'] = 'eye.png'; - $tabs['tracking']['text'] = __('Tracking'); - $tabs['tracking']['link'] = 'tbl_tracking.php'; -} - if (! (isset($db_is_information_schema) && $db_is_information_schema)) { $tabs['insert']['icon'] = 'b_insrow.png'; $tabs['insert']['link'] = 'tbl_change.php'; @@ -91,7 +84,13 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_ $tabs['operation']['icon'] = 'b_tblops.png'; $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = __('Operations'); - +} +if(PMA_Tracker::isActive()) { + $tabs['tracking']['icon'] = 'eye.png'; + $tabs['tracking']['text'] = __('Tracking'); + $tabs['tracking']['link'] = 'tbl_tracking.php'; +} +if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) { $tabs['empty']['link'] = 'sql.php'; $tabs['empty']['args']['reload'] = 1; $tabs['empty']['args']['sql_query'] = 'TRUNCATE TABLE ' . PMA_backquote($table);