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

only search include_path if relative path

Browse Source
This commit is contained in:
mohrt
2002-06-26 14:59:03 +00:00
parent 3dbab9bedc
commit ae93e0b65d
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Smarty.class.php
View File

@@ -1674,17 +1674,22 @@ function _run_insert_handler($args)
if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) { if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
// relative path // relative path
$_relative = true;
$_plugin_filepath = SMARTY_DIR . $_plugin_filepath; $_plugin_filepath = SMARTY_DIR . $_plugin_filepath;
} else {
$_relative = false;
} }
if (@is_readable($_plugin_filepath)) { if (@is_readable($_plugin_filepath)) {
return $_plugin_filepath; return $_plugin_filepath;
} }
// didn't find it try include path // didn't find it, try include path
if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) { if($_relative) {
return $_include_filepath; if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) {
} return $_include_filepath;
}
}
} }
return false; return false;

13
libs/Smarty.class.php
View File

@@ -1674,17 +1674,22 @@ function _run_insert_handler($args)
if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) { if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
// relative path // relative path
$_relative = true;
$_plugin_filepath = SMARTY_DIR . $_plugin_filepath; $_plugin_filepath = SMARTY_DIR . $_plugin_filepath;
} else {
$_relative = false;
} }
if (@is_readable($_plugin_filepath)) { if (@is_readable($_plugin_filepath)) {
return $_plugin_filepath; return $_plugin_filepath;
} }
// didn't find it try include path // didn't find it, try include path
if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) { if($_relative) {
return $_include_filepath; if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) {
} return $_include_filepath;
}
}
} }
return false; return false;