[pLog-svn] r6806 - plog/branches/lifetype-1.2/class/template/smarty

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-02-18 13:59:01 -0500 (Wed, 18 Feb 2009)
New Revision: 6806

Modified:
   plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php
   plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php
   plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php
Log:
upgraded to 2.6.22

Modified: plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php	2009-02-18 18:58:16 UTC (rev 6805)
+++ plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php	2009-02-18 18:59:01 UTC (rev 6806)
@@ -22,7 +22,7 @@
  * smarty-discussion-subscribe at googlegroups.com 
  *
  * @link http://www.smarty.net/
- * @version 2.6.19-dev
+ * @version 2.6.22
  * @copyright Copyright: 2001-2005 New Digital Group, Inc.
  * @author Andrei Zmievski <andrei at php.net>
  * @access public

Modified: plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php	2009-02-18 18:58:16 UTC (rev 6805)
+++ plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php	2009-02-18 18:59:01 UTC (rev 6806)
@@ -27,7 +27,7 @@
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei at php.net>
  * @package Smarty
- * @version 2.6.21
+ * @version 2.6.22
  */
 
 /* $Id: Smarty.class.php 2785 2008-09-18 21:04:12Z Uwe.Tews $ */
@@ -464,7 +464,7 @@
      *
      * @var string
      */
-    var $_version              = '2.6.21';
+    var $_version              = '2.6.22';
 
     /**
      * current template inclusion depth

Modified: plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php	2009-02-18 18:58:16 UTC (rev 6805)
+++ plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php	2009-02-18 18:59:01 UTC (rev 6806)
@@ -21,12 +21,12 @@
  * @link http://www.smarty.net/
  * @author Monte Ohrt <monte at ohrt dot com>
  * @author Andrei Zmievski <andrei at php.net>
- * @version 2.6.21
+ * @version 2.6.22
  * @copyright 2001-2005 New Digital Group, Inc.
  * @package Smarty
  */
 
-/* $Id: Smarty_Compiler.class.php 2797 2008-09-22 19:26:32Z monte.ohrt $ */
+/* $Id: Smarty_Compiler.class.php 2966 2008-12-08 15:10:03Z monte.ohrt $ */
 
 /**
  * Template compiling class
@@ -170,7 +170,7 @@
        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
                 . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-       $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . '(?:' . $this->_obj_ext_regexp . '(?:'.$this->_obj_params_regexp . ')?)*' . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
+       $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
         
         // matches valid modifier syntax:
         // |foo