aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-12-19 18:12:48 +0000
committerpatdenice <patdenice@piwigo.org>2008-12-19 18:12:48 +0000
commitd1e100bd03071dc42bf0fc7c4fc1950a6288c972 (patch)
treee3f2a3344d41fc1049e52a2b708291c22e6f3980 /include
parent1833f1138df4303d52c5afb71abd4cd80162ec15 (diff)
Upgrade Smarty to 2.6.22
git-svn-id: http://piwigo.org/svn/trunk@3000 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/smarty/NEWS5
-rw-r--r--include/smarty/README2
-rw-r--r--include/smarty/libs/Config_File.class.php2
-rw-r--r--include/smarty/libs/Smarty.class.php4
-rw-r--r--include/smarty/libs/Smarty_Compiler.class.php6
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