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

- improve getIncludePath() to return directory i

Browse Source
This commit is contained in:
Uwe Tews
2015-08-03 22:32:09 +02:00
parent 201ea13a33
commit 80ee385965
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -2,6 +2,7 @@
03.08.2015 03.08.2015
- rework clear cache methods - rework clear cache methods
- bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing - bugfix compileAllConfig() was broken since 3.1.22 because of the changes in config file processing
- improve getIncludePath() to return directory if no file was given
02.08.2015 02.08.2015
- optimization and code cleanup of {foreach} and {section} compiler - optimization and code cleanup of {foreach} and {section} compiler

10
libs/sysplugins/smarty_internal_get_include_path.php
View File

@@ -160,9 +160,9 @@ class Smarty_Internal_Get_Include_Path
$_u_dir = self::$_user_dirs[$dir_n] = $dir; $_u_dir = self::$_user_dirs[$dir_n] = $dir;
} }
} }
$_d_path = $_u_dir . (isset($file) ? $file : '');
if (self::$_has_stream_include) { if (self::$_has_stream_include) {
// available since PHP 5.3.2 // available since PHP 5.3.2
$_d_path = $_u_dir . (isset($file) ? $file : '');
self::$stream[$_d_path] = isset(self::$stream[$_d_path]) ? self::$stream[$_d_path] : ($path = stream_resolve_include_path($_d_path)) ? is_file($path) : false; self::$stream[$_d_path] = isset(self::$stream[$_d_path]) ? self::$stream[$_d_path] : ($path = stream_resolve_include_path($_d_path)) ? is_file($path) : false;
if (self::$stream[$_d_path]) { if (self::$stream[$_d_path]) {
return self::$isFile[$dir_n][$file] = self::$stream[$_d_path]; return self::$isFile[$dir_n][$file] = self::$stream[$_d_path];
@@ -172,10 +172,18 @@ class Smarty_Internal_Get_Include_Path
$path = self::$isPath[$key][$dir_n] = isset(self::$isPath[$key][$dir_n]) ? self::$isPath[$key][$dir_n] : is_dir($_i_path . $path = self::$isPath[$key][$dir_n] = isset(self::$isPath[$key][$dir_n]) ? self::$isPath[$key][$dir_n] : is_dir($_i_path .
$_u_dir) ? $_i_path . $_u_dir) ? $_i_path .
substr($_u_dir, 2) : false; substr($_u_dir, 2) : false;
if ($path === false) {
continue;
}
if (isset($file)) {
$_file = self::$isFile[$dir_n][$file] = ($path && is_file($path . $file)) ? $path . $file : false; $_file = self::$isFile[$dir_n][$file] = ($path && is_file($path . $file)) ? $path . $file : false;
if ($_file) { if ($_file) {
return $_file; return $_file;
} }
} else {
// no file was given return directory path
return $path;
}
} }
} }
return false; return false;