Changeset 3001


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

Location:
branches/2.0/include/smarty
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/2.0/include/smarty/NEWS

    r2962 r3001  
     1Version 2.6.22 (Dec 17th, 2008)
     2-------------------------------
     3
     4- back out method chaining, bug in some versions of PCRE causes errors (mohrt)
     5
    16Version 2.6.21 (Dec 2nd, 2008)
    27------------------------------

  • branches/2.0/include/smarty/README

    r2962 r3001  
    44    Smarty - the PHP compiling template engine
    55
    6 VERSION: 2.6.21
     6VERSION: 2.6.22
    77
    88AUTHORS:

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

    r2962 r3001  
    2323 *
    2424 * @link http://www.smarty.net/
    25  * @version 2.6.19-dev
     25 * @version 2.6.22
    2626 * @copyright Copyright: 2001-2005 New Digital Group, Inc.
    2727 * @author Andrei Zmievski <andrei@php.net>

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

    r2962 r3001  
    2828 * @author Andrei Zmievski <andrei@php.net>
    2929 * @package Smarty
    30  * @version 2.6.21
     30 * @version 2.6.22
    3131 */
    3232
    … …  
    465465     * @var string
    466466     */
    467     var $_version              = '2.6.21';
     467    var $_version              = '2.6.22';
    468468
    469469    /**

  • 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.