Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -15,6 +15,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

libraries/export.lib.php

@@ -45,9 +45,17 @@ 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()
+        && ((! @ini_get('zlib.output_compression')
+        && ! PMA_isGzHandlerEnabled())
+        || $GLOBALS['save_on_server'])
     ) {
         return true;
     } else {