Fix gzip export (fixes #896)

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index c427038e97478b3686597a597cd72ed0d948331c..87dea46060cf279977cc8dfa6fe8922e51473327 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -937,7 +937,10 @@ class Adminer {
                        ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
                )));
                if ($output == "gz") {
-                       ob_start('ob_gzencode', 1e6);
+                       ob_start(function ($string) {
+                               // ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
+                               return gzencode($string);
+                       }, 1e6);
                }
                return $ext;
        }

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 321df2d6bf8cb7db6ecd5c00522dbf174cd29922..7528ea0407e778b81760db0476bfc717eb0dcd7d 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -631,15 +631,6 @@ function doc_link($paths, $text = "<sup>?</sup>") {
        return ($paths[JUSH] ? "<a href='" . h($urls[JUSH] . $paths[JUSH] . (JUSH == 'mssql' ? "?view=sql-server-ver$version" : "")) . "'" . target_blank() . ">$text</a>" : "");
 }
 
-/** Wrap gzencode() for usage in ob_start()
-* @param string
-* @return string
-*/
-function ob_gzencode($string) {
-       // ob_start() callback receives an optional parameter $phase but gzencode() accepts optional parameter $level
-       return gzencode($string);
-}
-
 /** Compute size of database
 * @param string
 * @return string formatted

diff --git a/changes.txt b/changes.txt
index 41f02edaec33a968e390344b649760b9e4a2d6ca..e4e174ad9577dcb685944386fd544e5c05442090 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,5 @@
 Adminer dev:
+Fix gzip export (bug #896)
 Fix importing multiple SQL files not terminated by semicolon
 Use <datalist> for altering collations