aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-05-05 19:03:46 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-05-05 19:03:46 -0400
commitd8122df3329214f8710c8af3c0ce1ed86505e810 (patch)
tree2440c377c5413ac5fc63660a3333847f39cd2193
parentb057d7439e9ed27ec0aa6cff021fd6a9df6e85eb (diff)
downloadforums-d8122df3329214f8710c8af3c0ce1ed86505e810.tar
forums-d8122df3329214f8710c8af3c0ce1ed86505e810.tar.gz
forums-d8122df3329214f8710c8af3c0ce1ed86505e810.tar.bz2
forums-d8122df3329214f8710c8af3c0ce1ed86505e810.tar.xz
forums-d8122df3329214f8710c8af3c0ce1ed86505e810.zip
[feature/template-engine] Always call ob_end_clean.
We have to stop output buffering even when rendering fails. PHPBB3-9726
-rw-r--r--phpBB/includes/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 8529b90719..8d7eb57dc4 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -289,11 +289,11 @@ class phpbb_template
{
ob_start();
$result = $this->display($handle, $include_once);
+ $contents = ob_get_clean();
if ($result === false)
{
return false;
}
- $contents = ob_get_clean();
if ($return_content)
{