Started fixing server-side reloading of the querywindow

phpmyadmin · Oct 30, 2012 · 7232467 · 7232467
1 parent bc3d599
commit 7232467
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/js/ajax.js b/js/ajax.js
@@ -158,6 +158,14 @@ var AJAX = {
             if (data._reloadNavigation) {
                 PMA_reloadNavigation();
             }
+            if (data._reloadQuerywindow) {
+                var params = data._reloadQuerywindow;
+                reload_querywindow(
+                    params.db,
+                    params.table,
+                    params.sql_query
+                );
+            }
 
             if (data._title) {
                 $('title').replaceWith(data._title);

diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php
@@ -87,21 +87,6 @@ private function _addDefaultScripts()
                 });"
             );
 
-            // set current db, table and sql query in the querywindow
-            $query = '';
-            if (isset($GLOBALS['sql_query']) && strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-                $query = PMA_escapeJsString($GLOBALS['sql_query']);
-            }
-            $this->_scripts->addCode(
-                "if (window.parent.reload_querywindow) {
-                    window.parent.reload_querywindow(
-                        '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['db'], '')) . "',
-                        '" . PMA_escapeJsString(PMA_ifSetOr($GLOBALS['table'], '')) . "',
-                        '" . $query . "'
-                    );
-                }"
-            );
-
             if (! empty($GLOBALS['focus_querywindow'])) {
                 // set focus to the querywindow
                 $this->_scripts->addCode(

diff --git a/libraries/Response.class.php b/libraries/Response.class.php
@@ -300,8 +300,25 @@ private function _ajaxResponse()
             if (strlen($errors)) {
                 $this->addJSON('_errors', $errors);
             }
-            if (empty($GLOBALS['error_message']) && ! empty($GLOBALS['reload'])) {
-                $this->addJSON('_reloadNavigation', 1);
+            if (empty($GLOBALS['error_message'])) {
+                // set current db, table and sql query in the querywindow
+                $query = '';
+                if (isset($GLOBALS['sql_query'])
+                    && strlen($GLOBALS['sql_query']) < $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
+                ) {
+                    $query = PMA_escapeJsString($GLOBALS['sql_query']);
+                }
+                $this->addJSON(
+                    '_reloadQuerywindow',
+                    array(
+                        'db' => PMA_ifSetOr($GLOBALS['db'], ''),
+                        'table' => PMA_ifSetOr($GLOBALS['table'], ''),
+                        'sql_query' => $query
+                    )
+                );
+                if (! empty($GLOBALS['reload'])) {
+                    $this->addJSON('_reloadNavigation', 1);
+                }
             }
         }