[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1808-g6619e39
Madhura Jayaratne
madhuracj at users.sourceforge.net
Sun May 22 09:37:13 CEST 2011
The branch, master has been updated
via 6619e39d639bd994f5efe05e2766836cc1945145 (commit)
via 16305005c58e57b4f89150fe01b93f9071131601 (commit)
from 633f63004bfd3fd587dd8c164486dc302accafb2 (commit)
- Log -----------------------------------------------------------------
commit 6619e39d639bd994f5efe05e2766836cc1945145
Merge: 633f63004bfd3fd587dd8c164486dc302accafb2 16305005c58e57b4f89150fe01b93f9071131601
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: Sun May 22 13:06:05 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 b9650f0..6dcd985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,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 88c80af..2460042 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
More information about the Git
mailing list