From f8d4f21ef9aec0eed4df4d1009257b3ffbee97d5 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 2 Apr 2012 22:00:45 +0100 Subject: [PATCH 1/5] Revert "Fixed missing Codemirror for inline query edit when exporting a result set" This reverts commit 3998a38900130f3d4de53f431e4e865e182ea638. --- tbl_export.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tbl_export.php b/tbl_export.php index 6dfd6960ea..312cfb8aba 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -11,8 +11,6 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'export.js'; -$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; -$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Gets tables informations and displays top links From 24726360c436efd317f58d0f7cb5ed5cc9aa315f Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Fri, 30 Mar 2012 23:21:34 +0100 Subject: [PATCH 2/5] Fixed missing Codemirror for inline query edit when exporting a result set --- tbl_export.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tbl_export.php b/tbl_export.php index 312cfb8aba..6dfd6960ea 100644 --- a/tbl_export.php +++ b/tbl_export.php @@ -11,6 +11,8 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'export.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; /** * Gets tables informations and displays top links From 4c52281a93cd8eea25ee764f026d6902d4c29e8d Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Mon, 2 Apr 2012 22:04:39 +0100 Subject: [PATCH 3/5] Updated changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 44394f6dcc..067934a0b9 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 [interface] Fixed missing Codemirror for inline query edit when exporting a result set 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. From 53d427d0b8780f11742f7f25ae97dedaeb3fabd1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 31 Mar 2012 11:51:09 +0530 Subject: [PATCH 4/5] 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 5/5] 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; } }