diff options
| author | patdenice <patdenice@piwigo.org> | 2008-12-19 18:15:50 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2008-12-19 18:15:50 +0000 |
| commit | ae19b0336788c36f0b89a1fc3e832bd9fe40340e (patch) | |
| tree | 7238e5119420325b6076f9397a901dd6cffe09e4 /include | |
| parent | 676c65a70159892218ee5e2a9618d6f1f04395ca (diff) | |
merge -c3000 from trunk to branch 2.0.
Upgrade Smarty to 2.6.22
git-svn-id: http://piwigo.org/svn/branches/2.0@3001 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/smarty/NEWS | 5 | ||||
| -rw-r--r-- | include/smarty/README | 2 | ||||
| -rw-r--r-- | include/smarty/libs/Config_File.class.php | 2 | ||||
| -rw-r--r-- | include/smarty/libs/Smarty.class.php | 4 | ||||
| -rw-r--r-- | include/smarty/libs/Smarty_Compiler.class.php | 6 |
5 files changed, 12 insertions, 7 deletions
diff --git a/include/smarty/NEWS b/include/smarty/NEWS index 19d9082b5..39c5f001b 100644 --- a/include/smarty/NEWS +++ b/include/smarty/NEWS @@ -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) ------------------------------ diff --git a/include/smarty/README b/include/smarty/README index 45cf23c86..13ff7609c 100644 --- a/include/smarty/README +++ b/include/smarty/README @@ -3,7 +3,7 @@ NAME: Smarty - the PHP compiling template engine -VERSION: 2.6.21 +VERSION: 2.6.22 AUTHORS: diff --git a/include/smarty/libs/Config_File.class.php b/include/smarty/libs/Config_File.class.php index 9dc5b3ee8..31b890750 100644 --- a/include/smarty/libs/Config_File.class.php +++ b/include/smarty/libs/Config_File.class.php @@ -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 diff --git a/include/smarty/libs/Smarty.class.php b/include/smarty/libs/Smarty.class.php index 7cdc0c835..95ec67bab 100644 --- a/include/smarty/libs/Smarty.class.php +++ b/include/smarty/libs/Smarty.class.php @@ -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 diff --git a/include/smarty/libs/Smarty_Compiler.class.php b/include/smarty/libs/Smarty_Compiler.class.php index d950b3485..374ba3d04 100644 --- a/include/smarty/libs/Smarty_Compiler.class.php +++ b/include/smarty/libs/Smarty_Compiler.class.php @@ -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 |