mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-05 19:04:27 +02:00
- reactivated $error_reporting property handling
This commit is contained in:
@@ -1,3 +1,10 @@
|
|||||||
|
12/11/2010
|
||||||
|
- reactivated $error_reporting property handling
|
||||||
|
|
||||||
|
===== Smarty 3.0.0 =====
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
11/11/2010
|
11/11/2010
|
||||||
- major update including some API changes
|
- major update including some API changes
|
||||||
|
|
||||||
|
@@ -318,6 +318,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);
|
||||||
|
if (isset($this->error_reporting)) {
|
||||||
|
$_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;
|
||||||
@@ -334,6 +337,9 @@ class Smarty extends Smarty_Internal_Data {
|
|||||||
$_output = $_template->getRenderedTemplate();
|
$_output = $_template->getRenderedTemplate();
|
||||||
}
|
}
|
||||||
$_template->rendered_content = null;
|
$_template->rendered_content = null;
|
||||||
|
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) {
|
||||||
|
Reference in New Issue
Block a user