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

- change Smarty does no longer mask out E_NOTICE by default during template processing

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-10-19 16:06:52 +00:00
parent 147c5d0631
commit be02af7246
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
19/10/2010
- change Smarty does no longer mask out E_NOTICE by default during template processing
13/10/2010 13/10/2010
- bugfix removed ambiguity between ternary and stream variable in template syntax - bugfix removed ambiguity between ternary and stream variable in template syntax
- bugfix use caching properties of template instead of smarty object when compiling child {block} - bugfix use caching properties of template instead of smarty object when compiling child {block}

9
libs/Smarty.class.php
View File

@@ -310,8 +310,9 @@ class Smarty extends Smarty_Internal_Data {
// create template object if necessary // create template object if necessary
($template instanceof $this->template_class)? $_template = $template : ($template instanceof $this->template_class)? $_template = $template :
$_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent); $_template = $this->createTemplate ($template, $cache_id, $compile_id, $parent);
$_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(isset($this->error_reporting) if (isset($this->error_reporting)) {
? $this->error_reporting : error_reporting() &~E_NOTICE); $_smarty_old_error_level = error_reporting($this->error_reporting);
}
// obtain data for cache modified check // obtain data for cache modified check
if ($this->cache_modified_check && $this->caching && $display) { if ($this->cache_modified_check && $this->caching && $display) {
$_isCached = $_template->isCached() && !$_template->has_nocache_code; $_isCached = $_template->isCached() && !$_template->has_nocache_code;
@@ -328,7 +329,9 @@ class Smarty extends Smarty_Internal_Data {
$_output = $_template->getRenderedTemplate(); $_output = $_template->getRenderedTemplate();
} }
$_template->rendered_content = null; $_template->rendered_content = null;
error_reporting($_smarty_old_error_level); if (isset($this->error_reporting)) {
error_reporting($_smarty_old_error_level);
}
// display or fetch // display or fetch
if ($display) { if ($display) {
if ($this->caching && $this->cache_modified_check) { if ($this->caching && $this->cache_modified_check) {

2
libs/sysplugins/smarty_internal_compile_private_special_variable.php
View File

@@ -104,7 +104,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
$compiled_ref = $compiled_ref . "[$_ind]"; $compiled_ref = $compiled_ref . "[$_ind]";
} }
} }
return $compiled_ref; return "(isset($compiled_ref)? $compiled_ref : null)";
} }
} }