only search include_path if relative path

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

View File

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

View File

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