From 6672e68509b80554c1a27c1e843d4d69df139ef1 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 13 Jan 2023 09:42:47 +1100 Subject: [PATCH] [REF] Upgrade Smarty to 2.6.32 --- Smarty/Config_File.class.php | 1 - Smarty/Smarty.class.php | 5 ++--- Smarty/Smarty_Compiler.class.php | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Smarty/Config_File.class.php b/Smarty/Config_File.class.php index 491fa8408..1ad6e73e4 100644 --- a/Smarty/Config_File.class.php +++ b/Smarty/Config_File.class.php @@ -22,7 +22,6 @@ * smarty-discussion-subscribe@googlegroups.com * * @link http://www.smarty.net/ - * @version 2.6.25-dev * @copyright Copyright: 2001-2005 New Digital Group, Inc. * @author Andrei Zmievski * @access public diff --git a/Smarty/Smarty.class.php b/Smarty/Smarty.class.php index 764b168ca..e5b6e3118 100644 --- a/Smarty/Smarty.class.php +++ b/Smarty/Smarty.class.php @@ -27,7 +27,6 @@ * @author Monte Ohrt * @author Andrei Zmievski * @package Smarty - * @version 2.6.31-dev */ /* $Id$ */ @@ -466,7 +465,7 @@ class Smarty * * @var string */ - var $_version = '2.6.31'; + var $_version = '2.6.32'; /** * current template inclusion depth @@ -1212,7 +1211,7 @@ function fetch($resource_name, $cache_id = null, $compile_id = null, $display = $_server_vars = ($this->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS']; $_last_modified_date = @substr($_server_vars['HTTP_IF_MODIFIED_SINCE'], 0, strpos($_server_vars['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); $_gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT'; - if (@count($this->_cache_info['insert_tags']) == 0 + if (empty($this->_cache_info['insert_tags']) && !$this->_cache_serials && $_gmt_mtime == $_last_modified_date) { if (php_sapi_name()=='cgi') diff --git a/Smarty/Smarty_Compiler.class.php b/Smarty/Smarty_Compiler.class.php index 6d186a40c..7f1ed25f7 100644 --- a/Smarty/Smarty_Compiler.class.php +++ b/Smarty/Smarty_Compiler.class.php @@ -21,7 +21,6 @@ * @link http://smarty.php.net/ * @author Monte Ohrt * @author Andrei Zmievski - * @version 2.6.25-dev * @copyright 2001-2005 New Digital Group, Inc. * @package Smarty */ @@ -1192,7 +1191,7 @@ function _compile_foreach_start($tag_args) } $output = '_foreach[$name]"; $output .= "{$foreach_props} = array('total' => count(\$_from), 'iteration' => 0);\n";