From 53d427d0b8780f11742f7f25ae97dedaeb3fabd1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 31 Mar 2012 11:51:09 +0530 Subject: [PATCH 1/2] bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows) Conflicts: ChangeLog --- ChangeLog | 1 + libraries/parse_analyze.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 067934a0b9..774300a07b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.5.1.0 (not yet released) - bug #3510784 [edit] Limit clause ignored when sort order is remembered - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1) +- bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows) - bug [interface] Fixed missing Codemirror for inline query edit when exporting a result set 3.5.0.0 (not yet released) diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index 73bf5cb757..b9ebd577d9 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -52,7 +52,7 @@ if ($is_select) { $db = $prev_db; } // Nijel: don't change reload, if we already decided to reload in import - if (empty($reload)) { + if (empty($reload) && empty($GLOBALS['ajax_request'])) { $reload = ($db == $prev_db) ? 0 : 1; } } From 24996871589eeba6d87db2e2b3b56af868ae98af Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 31 Mar 2012 13:31:13 +0530 Subject: [PATCH 2/2] Fix typo introduced in 89fc70 --- libraries/parse_analyze.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/parse_analyze.lib.php b/libraries/parse_analyze.lib.php index b9ebd577d9..69759204f6 100644 --- a/libraries/parse_analyze.lib.php +++ b/libraries/parse_analyze.lib.php @@ -52,7 +52,7 @@ if ($is_select) { $db = $prev_db; } // Nijel: don't change reload, if we already decided to reload in import - if (empty($reload) && empty($GLOBALS['ajax_request'])) { + if (empty($reload) && empty($GLOBALS['is_ajax_request'])) { $reload = ($db == $prev_db) ? 0 : 1; } }