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

fixed clear_compiled_tpl with explicit $tpl_file given

Browse Source 
fixed return value of smarty_core_rm_auto() + Smarty::_unlink()
This commit is contained in:
messju
2003-09-15 12:55:06 +00:00
parent d9bd4677ff
commit 7c38847c69
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/Smarty.class.php
View File

@@ -1095,7 +1095,8 @@ class Smarty
$_params = array('auto_base' => $this->compile_dir, $_params = array('auto_base' => $this->compile_dir,
'auto_source' => $tpl_file, 'auto_source' => $tpl_file,
'auto_id' => $compile_id, 'auto_id' => $compile_id,
'exp_time' => $exp_time); 'exp_time' => $exp_time,
'extensions' => array('.inc', '.php'));
require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rm_auto.php'); require_once(SMARTY_DIR . 'core' . DIRECTORY_SEPARATOR . 'core.rm_auto.php');
return smarty_core_rm_auto($_params, $this); return smarty_core_rm_auto($_params, $this);
} }
@@ -1897,11 +1898,11 @@ class Smarty
function _unlink($resource, $exp_time = null) function _unlink($resource, $exp_time = null)
{ {
if(isset($exp_time)) { if(isset($exp_time)) {
if(time() - filemtime($resource) >= $exp_time) { if(time() - @filemtime($resource) >= $exp_time) {
@unlink($resource); return @unlink($resource);
} }
} else { } else {
@unlink($resource); return @unlink($resource);
} }
} }

8
libs/core/core.rm_auto.php
View File

@@ -34,7 +34,13 @@ function smarty_core_rm_auto($params, &$smarty)
$_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']); $_tname = $smarty->_get_auto_filename($params['auto_base'], $params['auto_source'], $params['auto_id']);
if(isset($params['auto_source'])) { if(isset($params['auto_source'])) {
$_res = $smarty->_unlink($_tname); if (isset($params['extensions'])) {
$_res = false;
foreach ((array)$params['extensions'] as $_extension)
$_res |= $smarty->_unlink($_tname.$_extension, $params['exp_time']);
} else {
$_res = $smarty->_unlink($_tname, $params['exp_time']);
}
} elseif ($smarty->use_sub_dirs) { } elseif ($smarty->use_sub_dirs) {
$_params = array( $_params = array(
'dirname' => $_tname, 'dirname' => $_tname,