smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-11-02 21:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix relative paths in $template_dir broke relative path resolving in {include "../foo.tpl"}

Browse Source
This commit is contained in:
rodneyrehm
2011-09-20 14:12:34 +00:00
parent 29a7600b74
commit 2df84e24a6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/sysplugins/smarty_resource.php
View File

@@ -159,6 +159,11 @@ abstract class Smarty_Resource {
}
$file = dirname($_template->parent->source->filepath) . DS . $file;
$_file_exact_match = true;
if (!preg_match('/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/', $file)) {
// the path gained from the parent template is relative to the current working directory
// as expansions (like include_path) have already been done
$file = getcwd() . DS . $file;
}
} elseif ($_file_is_dotted) {
throw new SmartyException("Template '{$file}' may not start with ../ or ./'");
}