[prev in list] [next in list] [prev in thread] [next in thread]
List: smarty-cvs
Subject: [SMARTY-CVS] cvs: smarty /libs Smarty_Compiler.class.php
From: "Messju Mohr" <messju () php ! net>
Date: 2003-06-30 22:13:00
[Download RAW message or body]
messju Mon Jun 30 18:13:00 2003 EDT
Modified files:
/smarty/libs Smarty_Compiler.class.php
Log:
backed out errornously committed support for $foo->$bar
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.257 \
smarty/libs/Smarty_Compiler.class.php:1.258
--- smarty/libs/Smarty_Compiler.class.php:1.257 Mon Jun 30 11:41:24 2003
+++ smarty/libs/Smarty_Compiler.class.php Mon Jun 30 18:13:00 2003
@@ -39,7 +39,7 @@
* @package Smarty
*/
-/* $Id: Smarty_Compiler.class.php,v 1.257 2003/06/30 15:41:24 messju Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.258 2003/06/30 22:13:00 messju Exp $ */
/**
* Template compiling class
* @package Smarty
@@ -1606,7 +1606,7 @@
}
// 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 @@
} else {
$_output = "\$this->_tpl_vars['$_var_name']";
}
-
+
foreach ($_indexes as $_index) {
if ($_index{0} == '[') {
$_index = substr($_index, 1, -1);
@@ -1659,15 +1659,8 @@
$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;
--
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic