update $GLOBALS references to work properly with track_globals settings

This commit is contained in:
mohrt
2002-06-03 16:42:00 +00:00
parent c23569b7ca
commit 07ec5ba096
3 changed files with 9 additions and 5 deletions

6
NEWS
View File

@@ -1,4 +1,8 @@
- optimized for loops with count() function calls (monte) - update $GLOBALS references to work properly with
track_globals settings (Michal Prinke, Monte)
- fixed bug in math function with call to assign
(Grigory V. Kareev, Monte)
- optimized for loops with count() function calls (Monte)
- add month_value_format attribute to html_select_date - add month_value_format attribute to html_select_date
plugin (Gary Loescher, Monte) plugin (Gary Loescher, Monte)
- made it possible to use simple variables inside [] for - made it possible to use simple variables inside [] for

View File

@@ -565,7 +565,7 @@ class Smarty
$_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE); $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { && strstr($GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'], $this->_smarty_debug_id)) {
$this->debugging = true; $this->debugging = true;
} }
@@ -600,7 +600,7 @@ class Smarty
$_smarty_results .= $this->_generate_debug_output(); $_smarty_results .= $this->_generate_debug_output();
} }
if ($this->cache_modified_check) { if ($this->cache_modified_check) {
$last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
$gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT'; $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
if (@count($this->_cache_info['insert_tags']) == 0 if (@count($this->_cache_info['insert_tags']) == 0
&& $gmt_mtime == $last_modified_date) { && $gmt_mtime == $last_modified_date) {

View File

@@ -565,7 +565,7 @@ class Smarty
$_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE); $_smarty_old_error_level = $this->debugging ? error_reporting() : error_reporting(error_reporting() & ~E_NOTICE);
if (!$this->debugging && $this->debugging_ctrl == 'URL' if (!$this->debugging && $this->debugging_ctrl == 'URL'
&& strstr($GLOBALS['QUERY_STRING'], $this->_smarty_debug_id)) { && strstr($GLOBALS['HTTP_SERVER_VARS']['QUERY_STRING'], $this->_smarty_debug_id)) {
$this->debugging = true; $this->debugging = true;
} }
@@ -600,7 +600,7 @@ class Smarty
$_smarty_results .= $this->_generate_debug_output(); $_smarty_results .= $this->_generate_debug_output();
} }
if ($this->cache_modified_check) { if ($this->cache_modified_check) {
$last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3); $last_modified_date = substr($GLOBALS['HTTP_IF_MODIFIED_SINCE'], 0, strpos($GLOBALS['HTTP_SERVER_VARS']['HTTP_IF_MODIFIED_SINCE'], 'GMT') + 3);
$gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT'; $gmt_mtime = gmdate('D, d M Y H:i:s', $this->_cache_info['timestamp']).' GMT';
if (@count($this->_cache_info['insert_tags']) == 0 if (@count($this->_cache_info['insert_tags']) == 0
&& $gmt_mtime == $last_modified_date) { && $gmt_mtime == $last_modified_date) {