The branch, QA_3_4 has been updated via 03a75ab9e0049a1f21ace0e6e1ddad63658ae8d7 (commit) from 5a82da9ad352dede10c4b78cafb055a246e7af5f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9949461..ca34332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields +- bug #3399951 [export] Config for export compression not used 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 637b069..a58a441 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -298,8 +298,8 @@ if(isset($_GET['sql_query'])) { // zip, gzip and bzip2 encode features $is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress')); $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode')); - $is_bzip = ($cfg['BZipDump'] && @function_exists('bzcompress')); - if ($is_zip || $is_gzip || $is_bzip) { ?> + $is_bzip2 = ($cfg['BZipDump'] && @function_exists('bzcompress')); + if ($is_zip || $is_gzip || $is_bzip2) { ?> <li> <label for="compression" class="desc"><?php echo __('Compression:'); ?></label> <select id="compression" name="compression"> @@ -308,8 +308,8 @@ if(isset($_GET['sql_query'])) { <option value="zip" <?php echo ($selected_compression == "zip") ? 'selected="selected"' : ''; ?>><?php echo __('zipped'); ?></option> <?php } if ($is_gzip) { ?> <option value="gzip" <?php echo ($selected_compression == "gzip") ? 'selected="selected"' : ''; ?>><?php echo __('gzipped'); ?></option> - <?php } if ($is_bzip) { ?> - <option value="bzip" <?php echo ($selected_compression == "bzip") ? 'selected="selected"' : ''; ?>><?php echo __('bzipped'); ?></option> + <?php } if ($is_bzip2) { ?> + <option value="bzip2" <?php echo ($selected_compression == "bzip2") ? 'selected="selected"' : ''; ?>><?php echo __('bzipped'); ?></option> <?php } ?> </select> </li> hooks/post-receive -- phpMyAdmin