- bugfix using extendsall as default resource and {include} inside {b…

…lock} tags could produce unexpected results #183
smarty-php · Feb 14, 2016 · 7e36f98 · 7e36f98
1 parent 4b1ba73
commit 7e36f98
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -2,6 +2,7 @@
  14.02.2016
   - new tag {make_nocache} read NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/110
   - optimization of sub-template processing
+  - bugfix using extendsall as default resource and {include} inside {block} tags could produce unexpected results https://github.com/smarty-php/smarty/issues/183
 
  11.02.2016
   - improvement added KnockoutJS comments to trimwhitespace outputfilter https://github.com/smarty-php/smarty/issues/82 

diff --git 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.30-dev/40';
+    const SMARTY_VERSION = '3.1.30-dev/41';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_runtime_inheritance.php b/libs/sysplugins/smarty_internal_runtime_inheritance.php
@@ -70,7 +70,7 @@ class Smarty_Internal_Runtime_Inheritance
     public function init(Smarty_Internal_Template $tpl, $initChild, $blockNames = array())
     {
         // if called while executing parent template it must be a sub-template with new inheritance root
-        if ($initChild && $this->state == 3) {
+        if ($initChild && $this->state == 3 && (strpos($tpl->template_resource, 'extendsall') === false)) {
             $tpl->ext->_inheritance = new Smarty_Internal_Runtime_Inheritance();
             $tpl->ext->_inheritance->init($tpl, $initChild, $blockNames);
             return;