From 7639ff8b9512d79f901cfc78532cad5f13739d92 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sun, 23 Feb 2014 18:02:43 -0800 Subject: [PATCH] Improve gzip export ratio (bug #387) --- adminer/include/adminer.inc.php | 2 +- adminer/include/editing.inc.php | 9 +++++++++ changes.txt | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index cd420466..500f56d4 100644 --- a/adminer/include/adminer.inc.php +++ b/adminer/include/adminer.inc.php @@ -740,7 +740,7 @@ username.form['auth[driver]'].onchange(); ($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8" ))); if ($output == "gz") { - ob_start('gzencode', 1e6); + ob_start('ob_gzencode', 1e6); } return $ext; } diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php index ad9e8dd3..b5d7024c 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -496,3 +496,12 @@ function doc_link($paths) { ); return ($paths[$jush] ? "?" : ""); } + +/** Wrap gzencode() for usage in ob_start() +* @param string +* @return string +*/ +function ob_gzencode($string) { + // ob_start() callback recieves an optional parameter $phase but gzencode() accepts optional parameter $level + return gzencode($string); +} diff --git a/changes.txt b/changes.txt index e995e4ee..0ee725e4 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,5 @@ Adminer 4.0.4-dev: +Improve gzip export ratio (bug #387) MySQL: Respect daylight saving time in dump, bug since Adminer 3.6.4 SQLite: Display auto-created unique indexes, bug since Adminer 3.5.0 Editor: Fix login() method, bug since Adminer 4.0.0