Ignore:
Timestamp:
Dec 19, 2008, 7:15:50 PM (15 years ago)
Author:
patdenice
Message:

merge -c3000 from trunk to branch 2.0.
Upgrade Smarty to 2.6.22

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0/include/smarty/libs/Smarty_Compiler.class.php

    r2962 r3001  
    2222 * @author Monte Ohrt <monte at ohrt dot com>
    2323 * @author Andrei Zmievski <andrei@php.net>
    24  * @version 2.6.21
     24 * @version 2.6.22
    2525 * @copyright 2001-2005 New Digital Group, Inc.
    2626 * @package Smarty
    2727 */
    2828
    29 /* $Id: Smarty_Compiler.class.php 2797 2008-09-22 19:26:32Z monte.ohrt $ */
     29/* $Id: Smarty_Compiler.class.php 2966 2008-12-08 15:10:03Z monte.ohrt $ */
    3030
    3131/**
    … …  
    171171                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
    172172       $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
    173        $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 . ')*)?)';
     173       $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 . ')*)?)';
    174174       
    175175        // matches valid modifier syntax:
Note: See TracChangeset for help on using the changeset viewer.