smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix check for compile and cache IDs.

Browse Source
This commit is contained in:
andrey
2001-12-10 14:22:47 +00:00
parent 76f9483b62
commit 80c1085e59
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Smarty.class.php
View File

@@ -123,7 +123,7 @@ class Smarty
'IF_FUNCS' => array('array', 'list', 'IF_FUNCS' => array('array', 'list',
'isset', 'empty', 'isset', 'empty',
'count', 'sizeof', 'count', 'sizeof',
'in_array','is_array'), 'in_array', 'is_array'),
'INCLUDE_ANY' => false, 'INCLUDE_ANY' => false,
'PHP_TAGS' => false, 'PHP_TAGS' => false,
'MODIFIER_FUNCS' => array('count') 'MODIFIER_FUNCS' => array('count')
@@ -1360,7 +1360,7 @@ function _run_insert_handler($args)
return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id); return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id);
} else { } else {
// use local cache file // use local cache file
if (isset($compile_id) && isset($cache_id)) if (isset($compile_id) || isset($cache_id))
$auto_id = $compile_id . $cache_id; $auto_id = $compile_id . $cache_id;
else else
$auto_id = null; $auto_id = null;
@@ -1391,7 +1391,7 @@ function _run_insert_handler($args)
} else { } else {
// use local file cache // use local file cache
if (isset($compile_id) && isset($cache_id)) if (isset($compile_id) || isset($cache_id))
$auto_id = $compile_id . $cache_id; $auto_id = $compile_id . $cache_id;
else else
$auto_id = null; $auto_id = null;

6
libs/Smarty.class.php
View File

@@ -123,7 +123,7 @@ class Smarty
'IF_FUNCS' => array('array', 'list', 'IF_FUNCS' => array('array', 'list',
'isset', 'empty', 'isset', 'empty',
'count', 'sizeof', 'count', 'sizeof',
'in_array','is_array'), 'in_array', 'is_array'),
'INCLUDE_ANY' => false, 'INCLUDE_ANY' => false,
'PHP_TAGS' => false, 'PHP_TAGS' => false,
'MODIFIER_FUNCS' => array('count') 'MODIFIER_FUNCS' => array('count')
@@ -1360,7 +1360,7 @@ function _run_insert_handler($args)
return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id); return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id);
} else { } else {
// use local cache file // use local cache file
if (isset($compile_id) && isset($cache_id)) if (isset($compile_id) || isset($cache_id))
$auto_id = $compile_id . $cache_id; $auto_id = $compile_id . $cache_id;
else else
$auto_id = null; $auto_id = null;
@@ -1391,7 +1391,7 @@ function _run_insert_handler($args)
} else { } else {
// use local file cache // use local file cache
if (isset($compile_id) && isset($cache_id)) if (isset($compile_id) || isset($cache_id))
$auto_id = $compile_id . $cache_id; $auto_id = $compile_id . $cache_id;
else else
$auto_id = null; $auto_id = null;