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

- bugfix the source exits flag and timestamp was not setup when temple is in php include path (issue 69)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-12-16 17:00:51 +00:00
parent 36ec5acb0d
commit e439c13a3e
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
16.12.2011
- bugfix the source exits flag and timestamp was not setup when temple is in php include path (issue 69)
9.12.2011 9.12.2011
- bugfix {capture} tags around recursive {include} calls did throw exception (Forum Topic 20549) - bugfix {capture} tags around recursive {include} calls did throw exception (Forum Topic 20549)
- bugfix $auto_literal = false did not work with { block} tags in child templates (Forum Topic 20581) - bugfix $auto_literal = false did not work with { block} tags in child templates (Forum Topic 20581)

2
libs/sysplugins/smarty_resource.php
View File

@@ -265,11 +265,13 @@ abstract class Smarty_Resource {
if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) { if ($source->smarty->use_include_path && !preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $_directory)) {
// try PHP include_path // try PHP include_path
if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) { if (($_filepath = Smarty_Internal_Get_Include_Path::getIncludePath($_filepath)) !== false) {
if ($this->fileExists($source, $_filepath)) {
return $_filepath; return $_filepath;
} }
} }
} }
} }
}
// try absolute filepath // try absolute filepath
if ($this->fileExists($source, $file)) { if ($this->fileExists($source, $file)) {