summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--change_log.txt3
-rw-r--r--libs/Smarty.class.php2
-rw-r--r--libs/sysplugins/smarty_internal_debug.php2
3 files changed, 4 insertions, 3 deletions
diff --git a/change_log.txt b/change_log.txt
index 647af802..aa19638c 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,5 +1,6 @@
===== 3.1.31-dev ===== (xx.xx.xx)
-
+ 14.08.2016
+ - bugfix $smarty_>debugging = true; did E_NOTICE messages when {eval} tag was used https://github.com/smarty-php/smarty/issues/266
===== 3.1.30 ===== (07.08.2016)
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 65ce8bfe..b6ba2685 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/**
* smarty version
*/
- const SMARTY_VERSION = '3.1.31-dev/1';
+ const SMARTY_VERSION = '3.1.31-dev/2';
/**
* define variable scopes
diff --git a/libs/sysplugins/smarty_internal_debug.php b/libs/sysplugins/smarty_internal_debug.php
index d5cd60df..fb837e78 100644
--- a/libs/sysplugins/smarty_internal_debug.php
+++ b/libs/sysplugins/smarty_internal_debug.php
@@ -52,7 +52,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data
*/
public function start_template(Smarty_Internal_Template $template, $mode = null)
{
- if (isset($mode)) {
+ if (isset($mode) && (!isset($template->parent) || $template->parent->_objType !== 2)) {
$this->index ++;
$this->offset ++;
$this->template_data[ $this->index ] = null;