can be done only once

phpmyadmin · Jul 9, 2013 · bc055fe · bc055fe
1 parent 4c912a6
commit bc055fe
Showing 1 changed file with 12 additions and 23 deletions.
diff --git a/sql.php b/sql.php
@@ -236,19 +236,24 @@
         PMA_sendResponseForGridEdit($result);
     }
 
-    if (isset($_REQUEST['ajax_request']) && isset($_REQUEST['table_maintenance'])) {
+    // Gets the list of fields properties
+    if (isset($result) && $result) {
+        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
+        $fields_cnt  = count($fields_meta);
+    }
+
+    // Should be initialized these parameters before parsing
+    $showtable = isset($showtable) ? $showtable : null;
+    $printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
+    $url_query = isset($url_query) ? $url_query : null;
+
+    if (isset($_REQUEST['table_maintenance'])) {
         $response = PMA_Response::getInstance();
         $header   = $response->getHeader();
         $scripts  = $header->getScripts();
         $scripts->addFile('makegrid.js');
         $scripts->addFile('sql.js');
 
-        // Gets the list of fields properties
-        if (isset($result) && $result) {
-            $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-            $fields_cnt  = count($fields_meta);
-        }
-
         if (empty($disp_mode)) {
             // see the "PMA_setDisplayMode()" function in
             // libraries/DisplayResults.class.php
@@ -267,11 +272,6 @@
             );
         }
 
-        // Should be initialized these parameters before parsing
-        $showtable = isset($showtable) ? $showtable : null;
-        $printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
-        $url_query = isset($url_query) ? $url_query : null;
-
         if (!empty($sql_data) && ($sql_data['valid_queries'] > 1)) {
 
             $_SESSION['is_multi_query'] = true;
@@ -343,12 +343,6 @@
         $cfgRelation = PMA_getRelationsParam();
     }
 
-    // Gets the list of fields properties
-    if (isset($result) && $result) {
-        $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
-        $fields_cnt  = count($fields_meta);
-    }
-
     //begin the sqlqueryresults div here. container div
     $html_output .= '<div id="sqlqueryresults"';
     $html_output .= ' class="ajax"';
@@ -408,11 +402,6 @@
         $html_output .= $msg->getDisplay();
     }
 
-    // Should be initialized these parameters before parsing
-    $showtable = isset($showtable) ? $showtable : null;
-    $printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
-    $url_query = isset($url_query) ? $url_query : null;
-
     if (! empty($sql_data) && ($sql_data['valid_queries'] > 1) || $is_procedure) {
 
         $_SESSION['is_multi_query'] = true;