diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:14:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:14:40 +0200 |
| commit | 00a4ace57327483c1cf06acc8891aa42b205ccc7 (patch) | |
| tree | df7dedca08817b678fcd2bda81ec310e8e2eb7bb | |
| parent | 5e81b058cf703e28fff6686cc6f8d9770b740a37 (diff) | |
| parent | 9b62500a1068fd9c17409e435b53a33bb1cf6838 (diff) | |
| download | forums-00a4ace57327483c1cf06acc8891aa42b205ccc7.tar forums-00a4ace57327483c1cf06acc8891aa42b205ccc7.tar.gz forums-00a4ace57327483c1cf06acc8891aa42b205ccc7.tar.bz2 forums-00a4ace57327483c1cf06acc8891aa42b205ccc7.tar.xz forums-00a4ace57327483c1cf06acc8891aa42b205ccc7.zip | |
Merge remote-tracking branch 'p/ticket/10188' into develop-olympus
* p/ticket/10188:
[ticket/10188] Use ob_get_level in msg_handler for output buffering check.
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ceaf426850..9f1d39118a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3743,7 +3743,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { // flush the content, else we get a white page if output buffering is on - if ((int) @ini_get('output_buffering') === 1 || strtolower(@ini_get('output_buffering')) === 'on') + if (ob_get_level() > 0) { @ob_flush(); } |