bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop

libraries/header.inc.php

@@ -106,7 +106,10 @@ if (empty($GLOBALS['is_header_sent'])) {
                     $GLOBALS['strDatabase'],
                     's_db.png');
 
-            if (strlen($GLOBALS['table'])) {
+            // if the table is being dropped, $_REQUEST['purge'] is set
+            // (it always contains "1")
+            // so do not display the table name in upper div
+            if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) {
                 require_once './libraries/tbl_info.inc.php';
 
                 echo $separator;

libraries/tbl_links.inc.php

@@ -114,7 +114,6 @@ 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;