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

- bugfix a nested subblock in an inheritance child template was not replace by

Browse Source 
outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
This commit is contained in:
uwetews
2018-10-30 01:03:52 +01:00
parent 433d220fa1
commit 68537949f2
3 changed files with 6 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,8 @@
===== 3.1.34-dev-6 ===== ===== 3.1.34-dev-6 =====
30.10.2018
- bugfix a nested subblock in an inheritance child template was not replace by
outer level block with same name in same child template https://github.com/smarty-php/smarty/issues/500
29.10.2018 29.10.2018
- bugfix Smarty::$php_handling == PHP_PASSTHRU (default) did eat the "\n" (newline) character if it did directly followed - bugfix Smarty::$php_handling == PHP_PASSTHRU (default) did eat the "\n" (newline) character if it did directly followed
a PHP tag like "?>" or other https://github.com/smarty-php/smarty/issues/501 a PHP tag like "?>" or other https://github.com/smarty-php/smarty/issues/501

2
libs/Smarty.class.php
View File

@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.34-dev-6'; const SMARTY_VERSION = '3.1.34-dev-7';
/** /**
* define variable scopes * define variable scopes
*/ */

2
libs/sysplugins/smarty_internal_runtime_inheritance.php
View File

@@ -150,7 +150,7 @@ class Smarty_Internal_Runtime_Inheritance
return; return;
} }
// make sure we got child block of child template of current block // make sure we got child block of child template of current block
while ($block->child && $block->tplIndex <= $block->child->tplIndex) { while ($block->child && $block->child->child && $block->tplIndex <= $block->child->tplIndex) {
$block->child = $block->child->child; $block->child = $block->child->child;
} }
$this->process($tpl, $block); $this->process($tpl, $block);