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

- removed checking for reserved variables

Browse Source
This commit is contained in:
Uwe.Tews
2009-11-11 16:54:04 +00:00
parent ba6ba0cf8d
commit ad70b964cb
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,5 +1,6 @@
11/11/2009 11/11/2009
- fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables - fixed {foreachelse}, {forelse}, {sectionelse} compiled code at nocache variables
- removed checking for reserved variables
11/10/2009 11/10/2009
- fixed preg_qoute on delimiters - fixed preg_qoute on delimiters

17
libs/sysplugins/smarty_internal_templatebase.php
View File

@@ -30,13 +30,11 @@ class Smarty_Internal_TemplateBase {
if (is_array($tpl_var)) { if (is_array($tpl_var)) {
foreach ($tpl_var as $_key => $_val) { foreach ($tpl_var as $_key => $_val) {
if ($_key != '') { if ($_key != '') {
$this->check_tplvar($_key);
$this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache, $scope); $this->tpl_vars[$_key] = new Smarty_variable($_val, $nocache, $scope);
} }
} }
} else { } else {
if ($tpl_var != '') { if ($tpl_var != '') {
$this->check_tplvar($tpl_var);
$this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache, $scope); $this->tpl_vars[$tpl_var] = new Smarty_variable($value, $nocache, $scope);
} }
} }
@@ -51,7 +49,6 @@ class Smarty_Internal_TemplateBase {
public function assign_global($varname, $value = null, $nocache = false) public function assign_global($varname, $value = null, $nocache = false)
{ {
if ($varname != '') { if ($varname != '') {
$this->check_tplvar($varname);
$this->smarty->global_tpl_vars[$varname] = new Smarty_variable($value, $nocache); $this->smarty->global_tpl_vars[$varname] = new Smarty_variable($value, $nocache);
} }
} }
@@ -66,7 +63,6 @@ class Smarty_Internal_TemplateBase {
public function assign_by_ref($tpl_var, &$value, $nocache = false, $scope = SMARTY_LOCAL_SCOPE) public function assign_by_ref($tpl_var, &$value, $nocache = false, $scope = SMARTY_LOCAL_SCOPE)
{ {
if ($tpl_var != '') { if ($tpl_var != '') {
$this->check_tplvar($tpl_var);
$this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache, $scope); $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache, $scope);
$this->tpl_vars[$tpl_var]->value = &$value; $this->tpl_vars[$tpl_var]->value = &$value;
} }
@@ -87,7 +83,6 @@ class Smarty_Internal_TemplateBase {
foreach ($tpl_var as $_key => $_val) { foreach ($tpl_var as $_key => $_val) {
if ($_key != '') { if ($_key != '') {
if (!isset($this->tpl_vars[$_key])) { if (!isset($this->tpl_vars[$_key])) {
$this->check_tplvar($_key);
$tpl_var_inst = $this->getVariable($_key, null, true, false); $tpl_var_inst = $this->getVariable($_key, null, true, false);
if ($tpl_var_inst instanceof Undefined_Smarty_Variable) { if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
$this->tpl_vars[$_key] = new Smarty_variable(null, $nocache, $scope); $this->tpl_vars[$_key] = new Smarty_variable(null, $nocache, $scope);
@@ -113,7 +108,6 @@ class Smarty_Internal_TemplateBase {
} else { } else {
if ($tpl_var != '' && isset($value)) { if ($tpl_var != '' && isset($value)) {
if (!isset($this->tpl_vars[$tpl_var])) { if (!isset($this->tpl_vars[$tpl_var])) {
$this->check_tplvar($tpl_var);
$tpl_var_inst = $this->getVariable($tpl_var, null, true, false); $tpl_var_inst = $this->getVariable($tpl_var, null, true, false);
if ($tpl_var_inst instanceof Undefined_Smarty_Variable) { if ($tpl_var_inst instanceof Undefined_Smarty_Variable) {
$this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache, $scope); $this->tpl_vars[$tpl_var] = new Smarty_variable(null, $nocache, $scope);
@@ -164,17 +158,6 @@ class Smarty_Internal_TemplateBase {
} }
} }
/**
* check if template variable name is reserved.
*
* @param string $tpl_var the template variable
*/
private function check_tplvar($tpl_var)
{
if (in_array($tpl_var, array('this', 'smarty'))) {
throw new Exception("Cannot assign value to reserved var '{$tpl_var}'");
}
}
/** /**
* clear the given assigned template variable. * clear the given assigned template variable.