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

- bugfix Smarty::error_reporting was not observed when display() or fetch() was called on template objects https://github.com/smarty-php/smarty/issues/145

Browse Source
This commit is contained in:
uwetews
2015-12-29 16:54:15 +01:00
parent 59b3a53089
commit 34062d45b7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,4 +1,7 @@
 ===== 3.1.30-dev ===== (xx.xx.xx)  ===== 3.1.30-dev ===== (xx.xx.xx)
29.12.2015
- bugfix Smarty::error_reporting was not observed when display() or fetch() was called on template objects https://github.com/smarty-php/smarty/issues/145
28.12.2015 28.12.2015
- optimization of {foreach} code size and processing - optimization of {foreach} code size and processing
@@ -13,7 +16,6 @@
- optimization replace hhvm extension by inline code - optimization replace hhvm extension by inline code
- new feature If ACP is enabled force an apc_compile_file() when compiled or cached template was updated - new feature If ACP is enabled force an apc_compile_file() when compiled or cached template was updated
24.12.2015 24.12.2015
- new feature Compiler does now observe the template_dir setting and will create separate compiled files if required - new feature Compiler does now observe the template_dir setting and will create separate compiled files if required
- bugfix post filter did fail on template inheritance https://github.com/smarty-php/smarty/issues/144 - bugfix post filter did fail on template inheritance https://github.com/smarty-php/smarty/issues/144

5
libs/sysplugins/smarty_internal_templatebase.php
View File

@@ -174,7 +174,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
$level = ob_get_level(); $level = ob_get_level();
try { try {
$_smarty_old_error_level = $_smarty_old_error_level =
($this->_objType == 1 && isset($smarty->error_reporting)) ? error_reporting($smarty->error_reporting) : isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) :
null; null;
if ($function == 2) { if ($function == 2) {
if ($template->caching) { if ($template->caching) {
@@ -204,6 +204,9 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
while (ob_get_level() > $level) { while (ob_get_level() > $level) {
ob_end_clean(); ob_end_clean();
} }
if (isset($_smarty_old_error_level)) {
error_reporting($_smarty_old_error_level);
}
throw $e; throw $e;
} }
} }