Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>

ChangeLog

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.2.13.0 (not yet released)
 - bug #4604 Query history not being deleted
+- bug #4057 db/table query string parameters no longer work
 
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled

index.php

@@ -53,6 +53,17 @@ if (! empty($_REQUEST['target'])
     exit;
 }
 
+if (! empty($_REQUEST['db'])) {
+    $page = null;
+    if (! empty($_REQUEST['table'])) {
+        $page = $GLOBALS['cfg']['DefaultTabTable'];
+    } else {
+        $page = $GLOBALS['cfg']['DefaultTabDatabase'];
+    }
+    include $page;
+    exit;
+}
+
 /**
  * Check if it is an ajax request to reload the recent tables list.
  */