From 863c29bbe7357a793fe924fe3966f70e7197e426 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 1 Jul 2015 02:10:12 +0530 Subject: [PATCH 1/2] Separate file export works with ZIP only Signed-off-by: Deven Bansod --- libraries/display_export.lib.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index f21b2da609..2829299cde 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -586,6 +586,13 @@ function PMA_getHtmlForExportOptionsOutputCompression() $selected_compression = "none"; } + // Since separate files export works with ZIP only + if (isset($cfg['Export']['as_separate_files']) + && $cfg['Export']['as_separate_files'] + ) { + $selected_compression = "zip"; + } + $html = ""; // zip and gzip encode features $is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress')); From 2ff6d53b1242074bcbe27d2e63a16d130647821b Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 1 Jul 2015 02:33:00 +0530 Subject: [PATCH 2/2] Fixed typos Signed-off-by: Deven Bansod --- libraries/config.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index becb42e243..485a6039c4 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1403,7 +1403,7 @@ $cfg['Export']['compression'] = 'none'; $cfg['Export']['lock_tables'] = false; /** - * Whether to export databases/tablse as seperate files + * Whether to export databases/tables as separate files * * @global boolean $cfg['Export']['as_separate_files'] */