From f8b2640156682be285ee05f93e8416b3efbcf595 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Mon, 10 Mar 2025 18:51:28 +0100 Subject: [PATCH] Fix gzip export (fixes #896) --- adminer/include/adminer.inc.php | 5 ++++- adminer/include/editing.inc.php | 9 --------- changes.txt | 1 + 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index c427038e..87dea460 100644 --- 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 321df2d6..7528ea04 100644 --- a/adminer/include/editing.inc.php +++ b/adminer/include/editing.inc.php @@ -631,15 +631,6 @@ function doc_link($paths, $text = "?") { return ($paths[JUSH] ? "$text" : ""); } -/** 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 41f02eda..e4e174ad 100644 --- 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 for altering collations -- 2.39.5