[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-32-g1630500

[Madhura Jayaratne]

The branch, QA_3_4 has been updated
       via  16305005c58e57b4f89150fe01b93f9071131601 (commit)
      from  f5eaf8c7d87e2c793f26127da20d25becf959ad8 (commit)


- Log -----------------------------------------------------------------
commit 16305005c58e57b4f89150fe01b93f9071131601
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun May 22 13:00:39 2011 +0530

    bug #3305517 [config] Config for export compression not used

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

Summary of changes:
 ChangeLog                        |    1 +
 libraries/display_export.lib.php |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5aede20..3942083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 - bug #3303869 [interface] Unnecessary scrolling on Databases page
 - patch #3303813 [setup] Define a label that was missing
 - bug #3305606 [interface] Show all button wraps on privileges page
+- bug #3305517 [config] Config for export compression not used
 
 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 10e8178..87c3a8e 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -296,7 +296,9 @@ if(isset($_GET['sql_query'])) {
                 ?>
                  <?php
                 if(isset($_GET['compression'])) {
-                     $selected_compression = $_GET['compression'];
+                    $selected_compression = $_GET['compression'];
+                } elseif (isset($cfg['Export']['compression'])) {
+                    $selected_compression = $cfg['Export']['compression'];
                 } else {
                     $selected_compression = "none";
                 }


hooks/post-receive
-- 
phpMyAdmin