php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Upgrade to Smarty 2.6.22 to fix a PCRE bug

Browse Source
This commit is contained in:
Garvin Hicking
2008-12-30 10:13:35 +00:00
parent 73d0835346
commit 2bb681dafb
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundled-libs/Smarty/NEWS
+5
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) Version 2.6.21 (Dec 2nd, 2008)
------------------------------ ------------------------------
bundled-libs/Smarty/README
+1 -1
View File
@@ -3,7 +3,7 @@ NAME:
Smarty - the PHP compiling template engine Smarty - the PHP compiling template engine
VERSION: 2.6.21 VERSION: 2.6.22
AUTHORS: AUTHORS:
bundled-libs/Smarty/libs/Config_File.class.php
+1 -1
View File
@@ -22,7 +22,7 @@
* smarty-discussion-subscribe@googlegroups.com * smarty-discussion-subscribe@googlegroups.com
* *
* @link http://www.smarty.net/ * @link http://www.smarty.net/
* @version 2.6.19-dev * @version 2.6.22
* @copyright Copyright: 2001-2005 New Digital Group, Inc. * @copyright Copyright: 2001-2005 New Digital Group, Inc.
* @author Andrei Zmievski <andrei@php.net> * @author Andrei Zmievski <andrei@php.net>
* @access public * @access public
bundled-libs/Smarty/libs/Smarty.class.php
+2 -2
View File
@@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com> * @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei@php.net> * @author Andrei Zmievski <andrei@php.net>
* @package Smarty * @package Smarty
* @version 2.6.21 * @version 2.6.22
*/ */
/* $Id: Smarty.class.php 2785 2008-09-18 21:04:12Z Uwe.Tews $ */ /* $Id: Smarty.class.php 2785 2008-09-18 21:04:12Z Uwe.Tews $ */
@@ -464,7 +464,7 @@ class Smarty
* *
* @var string * @var string
*/ */
var $_version = '2.6.21'; var $_version = '2.6.22';
/** /**
* current template inclusion depth * current template inclusion depth
bundled-libs/Smarty/libs/Smarty_Compiler.class.php
+3 -3
View File
@@ -21,12 +21,12 @@
* @link http://www.smarty.net/ * @link http://www.smarty.net/
* @author Monte Ohrt <monte at ohrt dot com> * @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei@php.net> * @author Andrei Zmievski <andrei@php.net>
* @version 2.6.21 * @version 2.6.22
* @copyright 2001-2005 New Digital Group, Inc. * @copyright 2001-2005 New Digital Group, Inc.
* @package Smarty * @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 * Template compiling class
@@ -170,7 +170,7 @@ class Smarty_Compiler extends Smarty {
$this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
. '(?:\s*,\s*' . $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_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: // matches valid modifier syntax:
// |foo // |foo
docs/NEWS
+2
View File
@@ -6,6 +6,8 @@ Version 1.5 ()
Version 1.4.1 () Version 1.4.1 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Upgrade to Smarty 2.6.22 to fix a PCRE bug
* Remove warning message when checking for plugin documentation files * Remove warning message when checking for plugin documentation files
on open_basedir servers (garvinhicking) on open_basedir servers (garvinhicking)