From 52e2093abe7b3c3c44f7c5431e05fe1ebaa7ba08 Mon Sep 17 00:00:00 2001 From: messju Date: Mon, 30 Jun 2003 22:13:00 +0000 Subject: [PATCH] backed out errornously committed support for $foo->$bar --- libs/Smarty_Compiler.class.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libs/Smarty_Compiler.class.php b/libs/Smarty_Compiler.class.php index e0f0cbdc..8058cb2e 100644 --- a/libs/Smarty_Compiler.class.php +++ b/libs/Smarty_Compiler.class.php @@ -1606,7 +1606,7 @@ class Smarty_Compiler extends Smarty { } // get [foo] and .foo and ->foo and (...) pieces - preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+!', $_var_ref, $match); + preg_match_all('!(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\w+|\.\$?\w+|\S+!', $_var_ref, $match); $_indexes = $match[0]; $_var_name = array_shift($_indexes); @@ -1635,7 +1635,7 @@ class Smarty_Compiler extends Smarty { } else { $_output = "\$this->_tpl_vars['$_var_name']"; } - + foreach ($_indexes as $_index) { if ($_index{0} == '[') { $_index = substr($_index, 1, -1); @@ -1659,15 +1659,8 @@ class Smarty_Compiler extends Smarty { $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__); } elseif($this->security && substr($_index, 2, 1) == '_') { $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__); - } elseif ($_index{2} == '$') { - if ($this->security) { - $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__); - } else { - $_output .= '->{$this->_tpl_vars[\''.substr($_index,3).'\']}'; - } - } else { - $_output .= $_index; - } + } + $_output .= $_index; } elseif ($_index{0} == '(') { $_index = $this->_parse_parenth_args($_index); $_output .= $_index;