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

bug #3399951 [export] Config for export compression not used

Browse Source
This commit is contained in:
Marc Delisle
2011-09-11 06:51:09 -04:00
parent 5a82da9ad3
commit 03a75ab9e0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- patch #3404173 InnoDB comment display with tooltips/aliases - patch #3404173 InnoDB comment display with tooltips/aliases
- bug #3404886 [navi] Edit SQL statement after error - bug #3404886 [navi] Edit SQL statement after error
- bug #3403165 [interface] Collation not displayed for long enum fields - 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) 3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd - bug #3375325 [interface] Page list in navigation frame looks odd

8
libraries/display_export.lib.php
View File

@@ -298,8 +298,8 @@ if(isset($_GET['sql_query'])) {
// zip, gzip and bzip2 encode features // zip, gzip and bzip2 encode features
$is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress')); $is_zip = ($cfg['ZipDump'] && @function_exists('gzcompress'));
$is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode')); $is_gzip = ($cfg['GZipDump'] && @function_exists('gzencode'));
$is_bzip = ($cfg['BZipDump'] && @function_exists('bzcompress')); $is_bzip2 = ($cfg['BZipDump'] && @function_exists('bzcompress'));
if ($is_zip || $is_gzip || $is_bzip) { ?> if ($is_zip || $is_gzip || $is_bzip2) { ?>
<li> <li>
<label for="compression" class="desc"><?php echo __('Compression:'); ?></label> <label for="compression" class="desc"><?php echo __('Compression:'); ?></label>
<select id="compression" name="compression"> <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> <option value="zip" <?php echo ($selected_compression == "zip") ? 'selected="selected"' : ''; ?>><?php echo __('zipped'); ?></option>
<?php } if ($is_gzip) { ?> <?php } if ($is_gzip) { ?>
<option value="gzip" <?php echo ($selected_compression == "gzip") ? 'selected="selected"' : ''; ?>><?php echo __('gzipped'); ?></option> <option value="gzip" <?php echo ($selected_compression == "gzip") ? 'selected="selected"' : ''; ?>><?php echo __('gzipped'); ?></option>
<?php } if ($is_bzip) { ?> <?php } if ($is_bzip2) { ?>
<option value="bzip" <?php echo ($selected_compression == "bzip") ? 'selected="selected"' : ''; ?>><?php echo __('bzipped'); ?></option> <option value="bzip2" <?php echo ($selected_compression == "bzip2") ? 'selected="selected"' : ''; ?>><?php echo __('bzipped'); ?></option>
<?php } ?> <?php } ?>
</select> </select>
</li> </li>