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

update plugin search logic

Browse Source
This commit is contained in:
mohrt
2002-06-26 15:08:35 +00:00
parent ae93e0b65d
commit abf7416f34
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Smarty.class.php
View File

@@ -1672,24 +1672,23 @@ function _run_insert_handler($args)
$_plugin_filepath = $_plugin_dir . DIR_SEP . $_plugin_filename; $_plugin_filepath = $_plugin_dir . DIR_SEP . $_plugin_filename;
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)) { if (@is_readable($_plugin_filepath)) {
return $_plugin_filepath; return $_plugin_filepath;
} }
// didn't find it, try include path // didn't find it, see if path is relative
if($_relative) { if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) { // relative path, see if it is in the SMARTY_DIR
if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
return SMARTY_DIR . $_plugin_filepath;
}
// didn't find it, try include path
if ($this->_get_include_path($_plugin_filepath, $_include_filepath)) {
return $_include_filepath; return $_include_filepath;
} }
} }
} }
return false; return false;

21
libs/Smarty.class.php
View File

@@ -1672,24 +1672,23 @@ function _run_insert_handler($args)
$_plugin_filepath = $_plugin_dir . DIR_SEP . $_plugin_filename; $_plugin_filepath = $_plugin_dir . DIR_SEP . $_plugin_filename;
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)) { if (@is_readable($_plugin_filepath)) {
return $_plugin_filepath; return $_plugin_filepath;
} }
// didn't find it, try include path // didn't find it, see if path is relative
if($_relative) { if (!preg_match("/^([\/\\\\]|[a-zA-Z]:[\/\\\\])/", $_plugin_dir)) {
if ($this->_get_include_path($_plugin_dir . DIR_SEP . $_plugin_filename, $_include_filepath)) { // relative path, see if it is in the SMARTY_DIR
if (@is_readable(SMARTY_DIR . $_plugin_filepath)) {
return SMARTY_DIR . $_plugin_filepath;
}
// didn't find it, try include path
if ($this->_get_include_path($_plugin_filepath, $_include_filepath)) {
return $_include_filepath; return $_include_filepath;
} }
} }
} }
return false; return false;