diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:17:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-05-23 10:17:26 +0200 |
| commit | fe3f3bc83962bf902f79654ad5fe7d40a49e4325 (patch) | |
| tree | cacfc942312d41486897e90a29f500f43eb280af /phpBB/includes/functions.php | |
| parent | 0aa6398163e892c120bb3d751c7051ea28ba849d (diff) | |
| parent | 00a4ace57327483c1cf06acc8891aa42b205ccc7 (diff) | |
| download | forums-fe3f3bc83962bf902f79654ad5fe7d40a49e4325.tar forums-fe3f3bc83962bf902f79654ad5fe7d40a49e4325.tar.gz forums-fe3f3bc83962bf902f79654ad5fe7d40a49e4325.tar.bz2 forums-fe3f3bc83962bf902f79654ad5fe7d40a49e4325.tar.xz forums-fe3f3bc83962bf902f79654ad5fe7d40a49e4325.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10188] Use ob_get_level in msg_handler for output buffering check.
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 63d0f3387a..edbfc09ffd 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3681,7 +3681,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(); } |