From 80c1085e59b0d63ee36d19acbd7c8d2009b08c27 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 10 Dec 2001 14:22:47 +0000 Subject: [PATCH] Fix check for compile and cache IDs. --- Smarty.class.php | 6 +++--- libs/Smarty.class.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Smarty.class.php b/Smarty.class.php index 17498b3f..acb7a3b4 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -123,7 +123,7 @@ class Smarty 'IF_FUNCS' => array('array', 'list', 'isset', 'empty', 'count', 'sizeof', - 'in_array','is_array'), + 'in_array', 'is_array'), 'INCLUDE_ANY' => false, 'PHP_TAGS' => false, 'MODIFIER_FUNCS' => array('count') @@ -1360,7 +1360,7 @@ function _run_insert_handler($args) return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id); } else { // use local cache file - if (isset($compile_id) && isset($cache_id)) + if (isset($compile_id) || isset($cache_id)) $auto_id = $compile_id . $cache_id; else $auto_id = null; @@ -1391,7 +1391,7 @@ function _run_insert_handler($args) } else { // use local file cache - if (isset($compile_id) && isset($cache_id)) + if (isset($compile_id) || isset($cache_id)) $auto_id = $compile_id . $cache_id; else $auto_id = null; diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 17498b3f..acb7a3b4 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -123,7 +123,7 @@ class Smarty 'IF_FUNCS' => array('array', 'list', 'isset', 'empty', 'count', 'sizeof', - 'in_array','is_array'), + 'in_array', 'is_array'), 'INCLUDE_ANY' => false, 'PHP_TAGS' => false, 'MODIFIER_FUNCS' => array('count') @@ -1360,7 +1360,7 @@ function _run_insert_handler($args) return $funcname('write', $this, $results, $tpl_file, $cache_id, $compile_id); } else { // use local cache file - if (isset($compile_id) && isset($cache_id)) + if (isset($compile_id) || isset($cache_id)) $auto_id = $compile_id . $cache_id; else $auto_id = null; @@ -1391,7 +1391,7 @@ function _run_insert_handler($args) } else { // use local file cache - if (isset($compile_id) && isset($cache_id)) + if (isset($compile_id) || isset($cache_id)) $auto_id = $compile_id . $cache_id; else $auto_id = null;