smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return to saved output buffer level on exceptions

Browse Source
This commit is contained in:
Uwe Tews
2015-03-01 21:39:54 +01:00
parent 464b37c053
commit b1cd4cd7d2
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/sysplugins/smarty_internal_template.php
View File

@@ -335,6 +335,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
*/ */
public function getRenderedTemplateCode() public function getRenderedTemplateCode()
{ {
$level = ob_get_level();
try { try {
ob_start(); ob_start();
if (empty($this->properties['unifunc']) || !is_callable($this->properties['unifunc'])) { if (empty($this->properties['unifunc']) || !is_callable($this->properties['unifunc'])) {
@@ -359,7 +360,9 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase
return ob_get_clean(); return ob_get_clean();
} }
catch (Exception $e) { catch (Exception $e) {
ob_get_clean(); while (ob_get_level() > $level) {
ob_end_clean();
}
throw $e; throw $e;
} }
} }

7
libs/sysplugins/smarty_resource_uncompiled.php
View File

@@ -56,13 +56,16 @@ abstract class Smarty_Resource_Uncompiled extends Smarty_Resource
*/ */
public function render($_template) public function render($_template)
{ {
try { $level = ob_get_level();
ob_start(); ob_start();
try {
$this->renderUncompiled($_template->source, $_template); $this->renderUncompiled($_template->source, $_template);
return ob_get_clean(); return ob_get_clean();
} }
catch (Exception $e) { catch (Exception $e) {
ob_get_clean(); while (ob_get_level() > $level) {
ob_end_clean();
}
throw $e; throw $e;
} }
} }

7
libs/sysplugins/smarty_template_compiled.php
View File

@@ -149,12 +149,15 @@ class Smarty_Template_Compiled
$compileCheck = $_template->smarty->compile_check; $compileCheck = $_template->smarty->compile_check;
$_template->smarty->compile_check = false; $_template->smarty->compile_check = false;
if ($_template->source->recompiled) { if ($_template->source->recompiled) {
try { $level = ob_get_level();
ob_start(); ob_start();
try {
eval("?>" . $this->code); eval("?>" . $this->code);
} }
catch (Exception $e) { catch (Exception $e) {
ob_get_clean(); while (ob_get_level() > $level) {
ob_end_clean();
}
throw $e; throw $e;
} }
ob_get_clean(); ob_get_clean();

7
libs/sysplugins/smarty_template_source.php
View File

@@ -219,13 +219,16 @@ class Smarty_Template_Source
*/ */
public function renderUncompiled(Smarty_Internal_Template $_template) public function renderUncompiled(Smarty_Internal_Template $_template)
{ {
try { $level = ob_get_level();
ob_start(); ob_start();
try {
$this->handler->renderUncompiled($_template->source, $_template); $this->handler->renderUncompiled($_template->source, $_template);
return ob_get_clean(); return ob_get_clean();
} }
catch (Exception $e) { catch (Exception $e) {
ob_get_clean(); while (ob_get_level() > $level) {
ob_end_clean();
}
throw $e; throw $e;
} }
} }