[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18585-g003d879

[Marc Delisle]

The branch, master has been updated
       via  003d879a64971573400e22b0756800c92ce40864 (commit)
       via  03a75ab9e0049a1f21ace0e6e1ddad63658ae8d7 (commit)
      from  dd0b1399e0808a20c5a6ec5b5444ab4ee8900e93 (commit)


- Log -----------------------------------------------------------------
commit 003d879a64971573400e22b0756800c92ce40864
Merge: dd0b139 03a75ab
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Sep 11 06:51:29 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

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 e78cf44..30c3085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,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 1a0a86f..a37c571 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -300,8 +300,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">
@@ -310,8 +310,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