smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug with quoted strings inside if statements.

Browse Source
This commit is contained in:
andrey
2001-06-14 14:26:59 +00:00
parent 7ea781c510
commit ef75416b25
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@@ -1,5 +1,7 @@
- added security features for third party template editing (Monte,Andrei) - fixed a bug with passing quoted arguments to modifiers inside {if}
- added assign custom function, documented (Monte) statements. (Andrei, Sam Beckwith)
- added security features for third party template editing. (Monte, Andrei)
- added assign custom function, documented. (Monte)
- fixed a problem with putting $ followed by numbers inside {strip} and - fixed a problem with putting $ followed by numbers inside {strip} and
{/strip} tags. (Andrei) {/strip} tags. (Andrei)
- fixed Config_File class to allow empty config paths (defaults to current - fixed Config_File class to allow empty config paths (defaults to current

2
Smarty_Compiler.class.php
View File

@@ -476,7 +476,7 @@ class Smarty_Compiler extends Smarty {
"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes
\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes
[()] | # match parentheses [()] | # match parentheses
[^"\'\s()]+ # match any other token that is not any of the above [^\s()]+ # match any other token that is not any of the above
)/x', $tag_args, $match); )/x', $tag_args, $match);
$tokens = $match[0]; $tokens = $match[0];

2
libs/Smarty_Compiler.class.php
View File

@@ -476,7 +476,7 @@ class Smarty_Compiler extends Smarty {
"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes
\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes
[()] | # match parentheses [()] | # match parentheses
[^"\'\s()]+ # match any other token that is not any of the above [^\s()]+ # match any other token that is not any of the above
)/x', $tag_args, $match); )/x', $tag_args, $match);
$tokens = $match[0]; $tokens = $match[0];