From e9ce45b3c2d9245e2b40982f3fd0fdde0bf6a449 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 12 Feb 2001 16:01:55 +0000 Subject: [PATCH] *** empty log message *** --- Smarty.class.php | 2 +- demo/templates/index.tpl | 6 ++++++ libs/Smarty.class.php | 2 +- templates/index.tpl | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Smarty.class.php b/Smarty.class.php index dd255649..86f68898 100644 --- a/Smarty.class.php +++ b/Smarty.class.php @@ -1187,7 +1187,7 @@ class Smarty function _parse_modifiers(&$output, $modifier_string) { $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\''; - preg_match_all('!\|@?(\w+)((?>:(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match); + preg_match_all('!\|(@?\w+)((?>:(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match); list(, $modifiers, $modifier_arg_strings) = $match; for ($i = 0; $i < count($modifiers); $i++) { diff --git a/demo/templates/index.tpl b/demo/templates/index.tpl index edd54399..960b7c94 100644 --- a/demo/templates/index.tpl +++ b/demo/templates/index.tpl @@ -3,6 +3,9 @@
 
+{$Name}
+{$Name}
+
 {* bold and title are read from the config file *}
 {if #bold#}{/if}
 {* capitalize the first letters of each word of the title *}
@@ -46,6 +49,8 @@ testing strip tags
 
 {/strip}
 
+
+ This is an example of the html_select_date function: @@ -61,3 +66,4 @@ This is an example of the html_options function: {html_options values=$option_values selected=$option_selected output=$option_output} + diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index dd255649..86f68898 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -1187,7 +1187,7 @@ class Smarty function _parse_modifiers(&$output, $modifier_string) { $qstr_regexp = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"|\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\''; - preg_match_all('!\|@?(\w+)((?>:(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match); + preg_match_all('!\|(@?\w+)((?>:(?:'. $qstr_regexp . '|[^|]+))*)!', '|' . $modifier_string, $match); list(, $modifiers, $modifier_arg_strings) = $match; for ($i = 0; $i < count($modifiers); $i++) { diff --git a/templates/index.tpl b/templates/index.tpl index edd54399..960b7c94 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -3,6 +3,9 @@
 
+{$Name}
+{$Name}
+
 {* bold and title are read from the config file *}
 {if #bold#}{/if}
 {* capitalize the first letters of each word of the title *}
@@ -46,6 +49,8 @@ testing strip tags
 
 {/strip}
 
+
+ This is an example of the html_select_date function: @@ -61,3 +66,4 @@ This is an example of the html_options function: {html_options values=$option_values selected=$option_selected output=$option_output} +