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

remove property $undefined. "null" is used literally instead

Browse Source
This commit is contained in:
messju
2003-11-22 00:32:38 +00:00
parent 0157c56198
commit c5b552163c
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -1,3 +1,5 @@
- remove property $undefined. "null" is used literally instead (messju)
Version 2.6.0 (Nov 19, 2003) Version 2.6.0 (Nov 19, 2003)
---------------------------- ----------------------------

11
libs/Smarty.class.php
View File

@@ -342,13 +342,6 @@ class Smarty
*/ */
var $global_assign = array('HTTP_SERVER_VARS' => array('SCRIPT_NAME')); var $global_assign = array('HTTP_SERVER_VARS' => array('SCRIPT_NAME'));
/**
* The value of "undefined". Leave it alone :-)
*
* @var null
*/
var $undefined = null;
/** /**
* This indicates which filters are automatically loaded into Smarty. * This indicates which filters are automatically loaded into Smarty.
* *
@@ -602,14 +595,14 @@ class Smarty
if (isset($GLOBALS[$key][$var])) { if (isset($GLOBALS[$key][$var])) {
$this->assign($var, $GLOBALS[$key][$var]); $this->assign($var, $GLOBALS[$key][$var]);
} else { } else {
$this->assign($var, $this->undefined); $this->assign($var, null);
} }
} }
} else { } else {
if (isset($GLOBALS[$var_name])) { if (isset($GLOBALS[$var_name])) {
$this->assign($var_name, $GLOBALS[$var_name]); $this->assign($var_name, $GLOBALS[$var_name]);
} else { } else {
$this->assign($var_name, $this->undefined); $this->assign($var_name, null);
} }
} }
} }