diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-01 03:09:49 -0400 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-01 03:09:49 -0400 |
commit | c844a277b2a6e4ad6232925fa78868cd945fc8a1 (patch) | |
tree | 77ef6ea2af46971d32b049b683be43f08e64c0ef | |
parent | 909ee59871402aa8dc7fa4e540d2f7e5da1628fc (diff) | |
download | forums-c844a277b2a6e4ad6232925fa78868cd945fc8a1.tar forums-c844a277b2a6e4ad6232925fa78868cd945fc8a1.tar.gz forums-c844a277b2a6e4ad6232925fa78868cd945fc8a1.tar.bz2 forums-c844a277b2a6e4ad6232925fa78868cd945fc8a1.tar.xz forums-c844a277b2a6e4ad6232925fa78868cd945fc8a1.zip |
[feature/template-engine] Check return value of display() in assign_display().
If display() failed, propagate the failure out of assign_display().
PHPBB3-9726
-rw-r--r-- | phpBB/includes/template.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index ae68f5fad3..b07e77989c 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -304,7 +304,11 @@ class phpbb_template public function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) { ob_start(); - $this->display($handle, $include_once); + $result = $this->display($handle, $include_once); + if ($result === false) + { + return false; + } $contents = ob_get_clean(); if ($return_content) |