cvs: smarty /libs Smarty_Compiler.class.php

mohrt		Thu Sep  9 14:21:09 2004 EDT

  Modified files:              
    /smarty/libs	Smarty_Compiler.class.php 
  Log:
  allow objects in arbitrary param positions
  
  
http://cvs.php.net/diff.php/smarty/libs/Smarty_Compiler.class.php?r1=1.338&r2=1.339&ty=u
Index: smarty/libs/Smarty_Compiler.class.php
diff -u smarty/libs/Smarty_Compiler.class.php:1.338 smarty/libs/Smarty_Compiler.class.php:1.339
--- smarty/libs/Smarty_Compiler.class.php:1.338	Thu Sep  9 12:09:55 2004
+++ smarty/libs/Smarty_Compiler.class.php	Thu Sep  9 14:21:09 2004
@@ -26,7 +26,7 @@
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php,v 1.338 2004/09/09 16:09:55 mohrt Exp $ */
+/* $Id: Smarty_Compiler.class.php,v 1.339 2004/09/09 18:21:09 mohrt Exp $ */
 
 /**
  * Template compiling class
@@ -149,11 +149,10 @@
         // $foo->bar->foo->bar()
         $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
         $this->_obj_params_regexp = '\((?:\w+|(?:'
-                . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp
-                . '(?:\((?:' . $this->_var_regexp
-                . '(?:\s*,\s*' . $this->_var_regexp
-                . ')*)?\))?)*)(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . ')))*)?\)';
+                . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp . '(?:\((?:' . $this->_var_regexp
+                . '(?:\s*,\s*' . $this->_var_regexp . ')*)?\))?)*)(?:\s*,\s*(?:(?:\w+|'
+                . $this->_var_regexp . '(?:' . $this->_obj_ext_regexp . '(?:\((?:' . $this->_var_regexp
+                . '(?:\s*,\s*' . $this->_var_regexp . ')*)?\))?))))*)?\)';
         $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
         $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?)';
 

-- 
Smarty CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php