Merge remote-tracking branch 'origin/master'

phpmyadmin · May 5, 2012 · fde3b81 · fde3b81
2 parents b20f0bf + ac5a8ca
commit fde3b81
Show file tree

Hide file tree

Showing 44 changed files with 561 additions and 726 deletions.
diff --git a/db_tracking.php b/db_tracking.php
@@ -57,11 +57,6 @@
 
 // ---------------------------------------------------------------------------
 
-/*
- * 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']) . '.' .