From 685c1d3495347e37615b892ace83fd2339408696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Wed, 1 Jan 2014 06:18:19 -0500 Subject: [PATCH 1/3] bug #4209 Missing compression in one case Signed-off-by: Marc Delisle --- export.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/export.php b/export.php index bd6f9d687f..c65dc91fef 100644 --- a/export.php +++ b/export.php @@ -301,8 +301,9 @@ function PMA_isGzHandlerEnabled() function PMA_gzencodeNeeded() { if (@function_exists('gzencode') - && ! @ini_get('zlib.output_compression') - && ! PMA_isGzHandlerEnabled() + && ((! @ini_get('zlib.output_compression') + && ! PMA_isGzHandlerEnabled()) + || $GLOBALS['save_on_server']) ) { return true; } else { From 69c24b78bb2d7d50a1d205f7ad13468e95d067d8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 1 Jan 2014 06:19:39 -0500 Subject: [PATCH 2/3] ChangeLog entry and fix explanation for bug #4209 Signed-off-by: Marc Delisle --- ChangeLog | 1 + export.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index f32c68caac..3d7365cbc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.1.4.0 (not yet released) - bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times +- bug #4209 Missing compression in one case 4.1.3.0 (2013-12-31) - bug #3938 PDFDefaultPageSize doc and easy configurability diff --git a/export.php b/export.php index c65dc91fef..18aae1c92f 100644 --- a/export.php +++ b/export.php @@ -300,6 +300,13 @@ function PMA_isGzHandlerEnabled() */ function PMA_gzencodeNeeded() { + /* + * We should gzencode only if the function exists + * but we don't want to compress twice, therefore + * gzencode only if transparent compression is not enabled + * and gz compression was not asked via $cfg['OBGzip'] + * but transparent compression does not apply when saving to server + */ if (@function_exists('gzencode') && ((! @ini_get('zlib.output_compression') && ! PMA_isGzHandlerEnabled()) From 4d13f69f6a5123a68ad10853fe336220133b1a65 Mon Sep 17 00:00:00 2001 From: zz zz Date: Wed, 1 Jan 2014 09:31:20 +0100 Subject: [PATCH 3/3] Translated using Weblate (Simplified Chinese) Currently translated at 93.5% (2573 of 2749) --- po/zh_CN.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 4bdd7b4b9c..1ff5f21246 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-09-26 20:35+0200\n" -"Last-Translator: Hao Luo \n" -"Language-Team: Simplified Chinese \n" +"PO-Revision-Date: 2014-01-01 09:31+0200\n" +"Last-Translator: zz zz \n" +"Language-Team: Simplified Chinese " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -411,7 +411,7 @@ msgstr "" #: error_report.php:37 error_report.php:54 error_report.php:65 #: error_report.php:81 msgid "You may want to refresh the page." -msgstr "" +msgstr "您需要刷新当前页面。" #: error_report.php:45 msgid ""