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

- bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-09-30 23:20:56 +00:00
parent 254230a5d5
commit 68b83f591d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== 3.1.20-dev ===== (xx.xx.2014) ===== 3.1.20-dev ===== (xx.xx.2014)
01.10.2014
- bugfix template resource of inheritance blocks could get invalid if the default resource type is not 'file'(Issue 202)
02.08.2014 02.08.2014
- bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193) - bugfix modifier wordwrap did output break string wrong if first word was exceeding length with cut = true (topic 25193)

2
libs/sysplugins/smarty_internal_compile_block.php
View File

@@ -377,7 +377,7 @@ class Smarty_Internal_Compile_Private_Child_Block extends Smarty_Internal_Compil
// update template with original template resource of {block} // update template with original template resource of {block}
if (trim($_attr['type'], "'") == 'file') { if (trim($_attr['type'], "'") == 'file') {
$compiler->template->template_resource = realpath(trim($_attr['file'], "'")); $compiler->template->template_resource = 'file:' . realpath(trim($_attr['file'], "'"));
} else { } else {
$compiler->template->template_resource = trim($_attr['resource'], "'"); $compiler->template->template_resource = trim($_attr['resource'], "'");
} }