patch #2976790 Go to the upper level after table DROP

ChangeLog

@@ -14,6 +14,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
 - [navi] Changed link to git repository on main page
 - bug #2972232 [menu] Import menu tab not present on main page
+- patch #2976790 [menu] Go to the upper level after table DROP,
+  thanks to Kaarel Nummert - kaarelnu
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 

libraries/common.lib.php

@@ -1591,6 +1591,11 @@ function PMA_generate_html_tab($tab, $url_params = array())
         $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"';
     }
 
+	// If there are any tab specific URL parameters, merge those with the general URL parameters
+	if(! empty($tab['url_params']) && is_array($tab['url_params'])) {
+		$url_params = array_merge($url_params, $tab['url_params']);
+	}
+
     // build the link
     if (!empty($tab['link'])) {
         $tab['link'] = htmlentities($tab['link']);

libraries/tbl_links.inc.php

@@ -114,6 +114,7 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_
 if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
     $tabs['drop']['icon'] = 'b_deltbl.png';
     $tabs['drop']['link'] = 'sql.php';
+    $tabs['drop']['url_params'] = array('table' => NULL);
     $tabs['drop']['text'] = $strDrop;
     $tabs['drop']['args']['reload']     = 1;
     $tabs['drop']['args']['purge']      = 1;