removed use of get_include_filepath() inside

get_auto_filename(). thanks go to c960657
This commit is contained in:
messju
2004-07-01 15:48:40 +00:00
parent 8c83b9e88b
commit ad79be90a0
2 changed files with 3 additions and 10 deletions

2
NEWS
View File

@@ -1,3 +1,5 @@
- fix unnecessary call to smarty_core_get_include_path() inside
Smarty::_get_auto_filename() (c960657, messju)
- add error-messages when anything else than an identifier is passed
to foreach's key- or item-attribute (messju)
- fix handling of digits inside tagnames (messju)

View File

@@ -1727,16 +1727,7 @@ class Smarty
function _get_auto_filename($auto_base, $auto_source = null, $auto_id = null)
{
$_compile_dir_sep = $this->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
if(@is_dir($auto_base)) {
$_return = $auto_base . DIRECTORY_SEPARATOR;
} else {
// auto_base not found, try include_path
$_params = array('file_path' => $auto_base);
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.get_include_path.php');
smarty_core_get_include_path($_params, $this);
$_return = isset($_params['new_file_path']) ? $_params['new_file_path'] . DIRECTORY_SEPARATOR : null;
}
$_return = $auto_base . DIRECTORY_SEPARATOR;
if(isset($auto_id)) {
// make auto_id safe for directory names