diff --git a/ChangeLog b/ChangeLog index fcc9185746..640d451351 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog - bug #4824 INNODB STATUS page is empty - bug #4828 JavaScript is loaded in wrong order - bug #4827 TEXT formatting doesn't work after inline editing +- bug #4822 Compress when php.ini output_buffering is active 4.4.0.0 (2015-04-01) + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php index 789ee4da55..43a6f3d208 100644 --- a/libraries/OutputBuffering.class.php +++ b/libraries/OutputBuffering.class.php @@ -45,11 +45,10 @@ class PMA_OutputBuffering // PMA_outBufferModeGet() function. $mode = 0; } elseif (function_exists('ob_get_level') && ob_get_level() > 0) { - // If output buffering is enabled in php.ini it's not possible to - // add the ob_gzhandler without a warning message from php 4.3.0. - // Being better safe than sorry, check for any existing output - // handler instead of just checking the 'output_buffering' setting. - $mode = 0; + // happens when php.ini's output_buffering is not Off + error_log('clean'); + ob_end_clean(); + $mode = 1; } else { $mode = 1; }