From f607d8a93cc2391e34000173b8eef13e1af8de61 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Mon, 31 Oct 2011 13:37:43 +0000
Subject: [PATCH] table structure: Do not send #topmenucontainer in ajax
 requests

---
 js/tbl_structure.js | 10 ++--------
 tbl_alter.php       |  4 +++-
 tbl_indexes.php     |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 6b26002a6c..99badc5171 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -366,10 +366,7 @@ $(document).ready(function() {
                     open: PMA_verifyColumnsProperties,
                     modal: true,
                     buttons : button_options
-                })
-                //Remove the top menu container from the dialog
-                .find("#topmenucontainer").hide()
-                ; // end dialog options
+                }); // end dialog options
 
                 $div = $("#add_columns");
                 /*changed the z-index of the enum editor to allow the edit*/
@@ -435,10 +432,7 @@ function changeColumns(action,url)
                 modal: true,
                 open: PMA_verifyColumnsProperties,
                 buttons : button_options
-            })
-            //Remove the top menu container from the dialog
-            .find("#topmenucontainer").hide()
-            ; // end dialog options
+            }); // end dialog options
             $("#append_fields_form input[name=do_save_data]").addClass("ajax");
             /*changed the z-index of the enum editor to allow the edit*/
             $("#enum_editor").css("z-index", "1100");
diff --git a/tbl_alter.php b/tbl_alter.php
index aace3169db..8efee90bc8 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -156,7 +156,9 @@ if (isset($_REQUEST['do_save_data'])) {
  * $selected comes from multi_submits.inc.php
  */
 if ($abort == false) {
-    include_once './libraries/tbl_links.inc.php';
+    if ($_REQUEST['ajax_request'] != true) {
+        include_once './libraries/tbl_links.inc.php';
+    }
 
     if (! isset($selected)) {
         PMA_checkParameters(array('field'));
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 0c9e5b3486..9805751780 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -124,7 +124,7 @@ if (isset($_REQUEST['do_save_data'])) {
 // Displays headers (if needed)
 $GLOBALS['js_include'][] = 'indexes.js';
 require_once './libraries/tbl_info.inc.php';
-if ( $GLOBALS['is_ajax_request'] != true) {
+if ($GLOBALS['is_ajax_request'] != true) {
     require_once './libraries/tbl_links.inc.php';
 }