archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -c3000 from trunk to branch 2.0.

Browse source 
Upgrade Smarty to 2.6.22

git-svn-id: http://piwigo.org/svn/branches/2.0@3001 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2008-12-19 18:15:50 +00:00
parent 676c65a701
commit ae19b03367
5 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/smarty/NEWS
View file

@ -1,3 +1,8 @@
Version 2.6.22 (Dec 17th, 2008)
-------------------------------
- back out method chaining, bug in some versions of PCRE causes errors (mohrt)
Version 2.6.21 (Dec 2nd, 2008)
------------------------------

2
include/smarty/README
View file

@ -3,7 +3,7 @@ NAME:
Smarty - the PHP compiling template engine
VERSION: 2.6.21
VERSION: 2.6.22
AUTHORS:

2
include/smarty/libs/Config_File.class.php
View file

@ -22,7 +22,7 @@
* smarty-discussion-subscribe@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@php.net>
* @access public

4
include/smarty/libs/Smarty.class.php
View file

@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei@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 @@ class Smarty
*
* @var string
*/
var $_version = '2.6.21';
var $_version = '2.6.22';
/**
* current template inclusion depth

6
include/smarty/libs/Smarty_Compiler.class.php
View file

@ -21,12 +21,12 @@
* @link http://www.smarty.net/
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei@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 @@ class Smarty_Compiler extends Smarty {
$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