[pLog-svn] r6804 - in plog/branches/lifetype-1.2/class/template/smarty: . internals plugins
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Wed Feb 18 13:57:19 EST 2009
Author: jondaley
Date: 2009-02-18 13:57:19 -0500 (Wed, 18 Feb 2009)
New Revision: 6804
Modified:
plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php
plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php
plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php
plog/branches/lifetype-1.2/class/template/smarty/internals/core.process_compiled_include.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.regex_replace.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/outputfilter.trimwhitespace.php
Log:
upgraded to 2.6.20
Modified: plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/Config_File.class.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* @link http://smarty.php.net/
- * @version 2.6.19
+ * @version 2.6.20
* @copyright Copyright: 2001-2005 New Digital Group, Inc.
* @author Andrei Zmievski <andrei at php.net>
* @access public
Modified: plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/Smarty.class.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -27,7 +27,7 @@
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei at php.net>
* @package Smarty
- * @version 2.6.19
+ * @version 2.6.20
*/
/* $Id: Smarty.class.php 2722 2007-06-18 14:29:00Z danilo $ */
@@ -464,7 +464,7 @@
*
* @var string
*/
- var $_version = '2.6.19';
+ var $_version = '2.6.20';
/**
* current template inclusion depth
Modified: plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/Smarty_Compiler.class.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -21,12 +21,12 @@
* @link http://smarty.php.net/
* @author Monte Ohrt <monte at ohrt dot com>
* @author Andrei Zmievski <andrei at php.net>
- * @version 2.6.19
+ * @version 2.6.20
* @copyright 2001-2005 New Digital Group, Inc.
* @package Smarty
*/
-/* $Id: Smarty_Compiler.class.php 2736 2007-09-16 14:47:53Z mohrt $ */
+/* $Id: Smarty_Compiler.class.php 2773 2008-08-12 18:17:51Z Uwe.Tews $ */
/**
* Template compiling class
@@ -1363,9 +1363,14 @@
/* If last token was a ')', we operate on the parenthesized
expression. The start of the expression is on the stack.
Otherwise, we operate on the last encountered token. */
- if ($tokens[$i-1] == ')')
+ if ($tokens[$i-1] == ')') {
$is_arg_start = array_pop($is_arg_stack);
- else
+ if ($is_arg_start != 0) {
+ if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
+ $is_arg_start--;
+ }
+ }
+ } else
$is_arg_start = $i-1;
/* Construct the argument for 'is' expression, so it knows
what to operate on. */
Modified: plog/branches/lifetype-1.2/class/template/smarty/internals/core.process_compiled_include.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/internals/core.process_compiled_include.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/internals/core.process_compiled_include.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -25,7 +25,7 @@
$smarty->_include($_include_file_path, true);
}
- foreach ($smarty->_cache_serials as $_include_file_path=>$_cache_serial) {
+ foreach ($smarty->_cache_info['cache_serials'] as $_include_file_path=>$_cache_serial) {
$_return = preg_replace_callback('!(\{nocache\:('.$_cache_serial.')#(\d+)\})!s',
array(&$smarty, '_process_compiled_include_callback'),
$_return);
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.regex_replace.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.regex_replace.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.regex_replace.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -22,14 +22,25 @@
*/
function smarty_modifier_regex_replace($string, $search, $replace)
{
+ if(is_array($search)) {
+ foreach($search as $idx => $s)
+ $search[$idx] = _smarty_regex_replace_check($s);
+ } else {
+ $search = _smarty_regex_replace_check($search);
+ }
+
+ return preg_replace($search, $replace, $string);
+}
+
+function _smarty_regex_replace_check($search)
+{
if (($pos = strpos($search,"\0")) !== false)
$search = substr($search,0,$pos);
if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
/* remove eval-modifier from $search */
$search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);
}
-
- return preg_replace($search, $replace, $string);
+ return $search;
}
/* vim: set expandtab: */
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/outputfilter.trimwhitespace.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/outputfilter.trimwhitespace.php 2009-02-18 18:56:32 UTC (rev 6803)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/outputfilter.trimwhitespace.php 2009-02-18 18:57:19 UTC (rev 6804)
@@ -28,21 +28,21 @@
function smarty_outputfilter_trimwhitespace($source, &$smarty)
{
// Pull out the script blocks
- preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match);
+ preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match);
$_script_blocks = $match[0];
- $source = preg_replace("!<script[^>]+>.*?</script>!is",
+ $source = preg_replace("!<script[^>]*?>.*?</script>!is",
'@@@SMARTY:TRIM:SCRIPT@@@', $source);
// Pull out the pre blocks
- preg_match_all("!<pre>.*?</pre>!is", $source, $match);
+ preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match);
$_pre_blocks = $match[0];
- $source = preg_replace("!<pre>.*?</pre>!is",
+ $source = preg_replace("!<pre[^>]*?>.*?</pre>!is",
'@@@SMARTY:TRIM:PRE@@@', $source);
-
+
// Pull out the textarea blocks
- preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match);
+ preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match);
$_textarea_blocks = $match[0];
- $source = preg_replace("!<textarea[^>]+>.*?</textarea>!is",
+ $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is",
'@@@SMARTY:TRIM:TEXTAREA@@@', $source);
// remove all leading spaces, tabs and carriage returns NOT
More information about the pLog-svn
mailing list