rename supers to _supers

This commit is contained in:
monte.ohrt
2009-05-16 23:27:22 +00:00
parent 2919f9a608
commit e11b8c6d7a
2 changed files with 22 additions and 14 deletions

View File

@@ -562,6 +562,14 @@ class Smarty
*/ */
var $_cache_including = false; var $_cache_including = false;
/**
* array of super globals internally
*
* @var array
*/
var $_supers = array();
/**#@-*/ /**#@-*/
/** /**
* The class constructor. * The class constructor.
@@ -571,13 +579,13 @@ class Smarty
$this->assign('SCRIPT_NAME', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] $this->assign('SCRIPT_NAME', isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME']
: @$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']); : @$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_NAME']);
$this->supers['get'] = $this->request_use_auto_globals ? $_GET : $GLOBALS['HTTP_GET_VARS']; $this->_supers['get'] = $this->request_use_auto_globals ? $_GET : $GLOBALS['HTTP_GET_VARS'];
$this->supers['post'] = $this->request_use_auto_globals ? $_POST : $GLOBALS['HTTP_POST_VARS']; $this->_supers['post'] = $this->request_use_auto_globals ? $_POST : $GLOBALS['HTTP_POST_VARS'];
$this->supers['server'] = $this->request_use_auto_globals ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS']; $this->_supers['server'] = $this->request_use_auto_globals ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
$this->supers['session'] = $this->request_use_auto_globals ? $_SESSION : $GLOBALS['HTTP_SESSION_VARS']; $this->_supers['session'] = $this->request_use_auto_globals ? $_SESSION : $GLOBALS['HTTP_SESSION_VARS'];
$this->supers['request'] = $this->request_use_auto_globals ? $_REQUEST : $GLOBALS['HTTP_REQUEST_VARS']; $this->_supers['request'] = $this->request_use_auto_globals ? $_REQUEST : $GLOBALS['HTTP_REQUEST_VARS'];
$this->supers['cookies'] = $this->request_use_auto_globals ? $_COOKIE : $GLOBALS['HTTP_COOKIE_VARS']; $this->_supers['cookies'] = $this->request_use_auto_globals ? $_COOKIE : $GLOBALS['HTTP_COOKIE_VARS'];
$this->supers['env'] = $this->request_use_auto_globals ? $_ENV : $GLOBALS['HTTP_ENV_VARS']; $this->_supers['env'] = $this->request_use_auto_globals ? $_ENV : $GLOBALS['HTTP_ENV_VARS'];
} }

View File

@@ -2047,27 +2047,27 @@ class Smarty_Compiler extends Smarty {
break; break;
case 'get': case 'get':
$compiled_ref = "\$this->supers['get']"; $compiled_ref = "\$this->_supers['get']";
break; break;
case 'post': case 'post':
$compiled_ref = "\$this->supers['post']"; $compiled_ref = "\$this->_supers['post']";
break; break;
case 'cookies': case 'cookies':
$compiled_ref = "\$this->supers['cookies']"; $compiled_ref = "\$this->_supers['cookies']";
break; break;
case 'env': case 'env':
$compiled_ref = "\$this->supers['env']"; $compiled_ref = "\$this->_supers['env']";
break; break;
case 'server': case 'server':
$compiled_ref = "\$this->supers['server']"; $compiled_ref = "\$this->_supers['server']";
break; break;
case 'session': case 'session':
$compiled_ref = "\$this->supers['session']"; $compiled_ref = "\$this->_supers['session']";
break; break;
/* /*
@@ -2076,7 +2076,7 @@ class Smarty_Compiler extends Smarty {
*/ */
case 'request': case 'request':
if ($this->request_use_auto_globals) { if ($this->request_use_auto_globals) {
$compiled_ref = "\$this->supers['request']"; $compiled_ref = "\$this->_supers['request']";
break; break;
} else { } else {
$this->_init_smarty_vars = true; $this->_init_smarty_vars = true;