gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1769 from devenbansod/342_correction

Browse Source 
'As Separate files' export works with ZIP compression only
This commit is contained in:
Isaac Bennetch 2015-07-01 00:10:36 -04:00
commit d9d25db53d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/config.default.php
View File

@ -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']
*/

7
libraries/display_export.lib.php
View File

@ -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'));