From b0cd85663205d4a251dae5195f7c47116ced0369 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 26 Feb 2014 06:47:41 +0530 Subject: [PATCH 1/2] bug #4297 DROP DATABASE tick box in export no longer works Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + export.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 90a1fbd548..3c4a6eb4a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.1.9.0 (not yet released) - bug #4279 CTRL + up or down moves two fields (part one) - bug #4294 output as text radio clickable for "OpenDocument Text" export +- bug #4297 DROP DATABASE tick box in export no longer works 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/export.php b/export.php index d874e9ef76..b93d9994e2 100644 --- a/export.php +++ b/export.php @@ -119,6 +119,7 @@ if (!defined('TESTSUITE')) { 'sql_max_query_size', 'sql_hex_for_blob', 'sql_utc_time', + 'sql_drop_database', 'csv_separator', 'csv_enclosed', 'csv_escaped', From ff064833ec46523c04b91aced2def15a63bef354 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 26 Feb 2014 07:22:04 +0530 Subject: [PATCH 2/2] bug #4291 Unable to export comments in OpenDocument text format Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + export.php | 3 ++- libraries/config.default.php | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4a6eb4a8..d992e6e237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4279 CTRL + up or down moves two fields (part one) - bug #4294 output as text radio clickable for "OpenDocument Text" export - bug #4297 DROP DATABASE tick box in export no longer works +- bug #4291 Unable to export comments in OpenDocument text format 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/export.php b/export.php index b93d9994e2..cac8b3c8b0 100644 --- a/export.php +++ b/export.php @@ -655,7 +655,8 @@ if (!defined('TESTSUITE')) { // Will we need relation & co. setup? $do_relation = isset($GLOBALS[$what . '_relation']); - $do_comments = isset($GLOBALS[$what . '_include_comments']); + $do_comments = isset($GLOBALS[$what . '_include_comments']) + || isset($GLOBALS[$what . '_comments']) ; $do_mime = isset($GLOBALS[$what . '_mime']); if ($do_relation || $do_comments || $do_mime) { $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/config.default.php b/libraries/config.default.php index bb19273a46..c6290c3ea9 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1898,13 +1898,6 @@ $cfg['Export']['sql_type'] = 'INSERT'; */ $cfg['Export']['sql_max_query_size'] = 50000; -/** - * - * - * @global boolean $cfg['Export']['sql_comments'] - */ -$cfg['Export']['sql_comments'] = false; - /** * *