From 4a77dab318ae971ec6a4f81b8ae01d5c7e570665 Mon Sep 17 00:00:00 2001 From: mohrt Date: Thu, 21 Feb 2002 17:14:10 +0000 Subject: [PATCH] update misc changes --- Config_File.class.php | 2 +- NEWS | 3 +++ Smarty.class.php | 13 ++++--------- Smarty_Compiler.class.php | 2 +- docs.sgml | 2 +- libs/Config_File.class.php | 2 +- libs/Smarty.class.php | 13 ++++--------- libs/Smarty_Compiler.class.php | 2 +- 8 files changed, 16 insertions(+), 23 deletions(-) diff --git a/Config_File.class.php b/Config_File.class.php index 04bb4213..d7ab6638 100644 --- a/Config_File.class.php +++ b/Config_File.class.php @@ -3,7 +3,7 @@ /** * Config_File class. * - * @version 1.5.2 + * @version 2.0 * @author Andrei Zmievski * @access public * diff --git a/NEWS b/NEWS index 44d5e0eb..f35ddc25 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Version 2.0 +----------- + - removed $tpl_file_ext variable, no longer used (Monte) - added "hex" and "hexentity" attributes to escape modifier (Monte) - removed dependency on PEAR. (Andrei) - update popup_init to accept src attribute. (Monte, Duncan Forrest) diff --git a/Smarty.class.php b/Smarty.class.php index 4bc58a9f..2c0f52d2 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -5,7 +5,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * Version: 1.5.2 + * Version: 2.0 * Copyright: 2001,2002 ispi of Lincoln, Inc. * * This library is free software; you can redistribute it and/or @@ -101,8 +101,6 @@ class Smarty var $default_template_handler_func = ''; // function to handle missing templates - var $tpl_file_ext = '.tpl'; // template file extention (deprecated) - var $php_handling = SMARTY_PHP_PASSTHRU; // how smarty handles php tags in the templates // possible values: @@ -159,7 +157,7 @@ class Smarty var $_conf_obj = null; // configuration object var $_config = array(); // loaded configuration settings var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty' - var $_version = '1.5.2'; // Smarty version number + var $_version = '2.0'; // Smarty version number var $_extract = false; // flag for custom functions var $_inclusion_depth = 0; // current template inclusion depth var $_compile_id = null; // for different compiled templates @@ -488,10 +486,8 @@ class Smarty \*======================================================================*/ function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) { - global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS; - if (!$this->debugging && $this->debugging_ctrl == 'URL' - && strstr($QUERY_STRING, $this->_smarty_debug_id)) { + && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { $this->debugging = true; } @@ -526,8 +522,7 @@ class Smarty $_smarty_results .= $this->_generate_debug_output(); } if ($this->cache_modified_check) { - global $HTTP_IF_MODIFIED_SINCE; - $last_modified_date = substr($HTTP_IF_MODIFIED_SINCE, 0, strpos($HTTP_IF_MODIFIED_SINCE, 'GMT') + 3); + $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['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 && $gmt_mtime == $last_modified_date) { diff --git a/Smarty_Compiler.class.php b/Smarty_Compiler.class.php index 983803e4..0ed0895d 100644 --- a/Smarty_Compiler.class.php +++ b/Smarty_Compiler.class.php @@ -6,7 +6,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * Version: 1.5.2 + * Version: 2.0 * Copyright: 2001,2002 ispi of Lincoln, Inc. * * This library is free software; you can redistribute it and/or diff --git a/docs.sgml b/docs.sgml index 146e9db1..e44016f2 100644 --- a/docs.sgml +++ b/docs.sgml @@ -14,7 +14,7 @@
andrei@php.net
- Version 1.5.2 + Version 2.0 2001ispi of Lincoln, Inc. diff --git a/libs/Config_File.class.php b/libs/Config_File.class.php index 04bb4213..d7ab6638 100644 --- a/libs/Config_File.class.php +++ b/libs/Config_File.class.php @@ -3,7 +3,7 @@ /** * Config_File class. * - * @version 1.5.2 + * @version 2.0 * @author Andrei Zmievski * @access public * diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 4bc58a9f..2c0f52d2 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -5,7 +5,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * Version: 1.5.2 + * Version: 2.0 * Copyright: 2001,2002 ispi of Lincoln, Inc. * * This library is free software; you can redistribute it and/or @@ -101,8 +101,6 @@ class Smarty var $default_template_handler_func = ''; // function to handle missing templates - var $tpl_file_ext = '.tpl'; // template file extention (deprecated) - var $php_handling = SMARTY_PHP_PASSTHRU; // how smarty handles php tags in the templates // possible values: @@ -159,7 +157,7 @@ class Smarty var $_conf_obj = null; // configuration object var $_config = array(); // loaded configuration settings var $_smarty_md5 = 'f8d698aea36fcbead2b9d5359ffca76f'; // md5 checksum of the string 'Smarty' - var $_version = '1.5.2'; // Smarty version number + var $_version = '2.0'; // Smarty version number var $_extract = false; // flag for custom functions var $_inclusion_depth = 0; // current template inclusion depth var $_compile_id = null; // for different compiled templates @@ -488,10 +486,8 @@ class Smarty \*======================================================================*/ function fetch($_smarty_tpl_file, $_smarty_cache_id = null, $_smarty_compile_id = null, $_smarty_display = false) { - global $HTTP_SERVER_VARS, $QUERY_STRING, $HTTP_COOKIE_VARS; - if (!$this->debugging && $this->debugging_ctrl == 'URL' - && strstr($QUERY_STRING, $this->_smarty_debug_id)) { + && strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { $this->debugging = true; } @@ -526,8 +522,7 @@ class Smarty $_smarty_results .= $this->_generate_debug_output(); } if ($this->cache_modified_check) { - global $HTTP_IF_MODIFIED_SINCE; - $last_modified_date = substr($HTTP_IF_MODIFIED_SINCE, 0, strpos($HTTP_IF_MODIFIED_SINCE, 'GMT') + 3); + $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['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 && $gmt_mtime == $last_modified_date) { diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index 983803e4..0ed0895d 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -6,7 +6,7 @@ * Author: Monte Ohrt * Andrei Zmievski * - * Version: 1.5.2 + * Version: 2.0 * Copyright: 2001,2002 ispi of Lincoln, Inc. * * This library is free software; you can redistribute it and/or