antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

* Continue parsing macro tags even if it is a comment. This is the only

Browse source 
way we can correctly catch embedded macros. Fixes bug 588.
  http://helma.org/bugs/show_bug.cgi?id=588
This commit is contained in:
hns 2008-05-15 09:45:33 +00:00
parent 0aaa141a4b
commit 449cbd815e
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/helma/framework/core/Skin.java
View file

@ -437,13 +437,8 @@ public final class Skin {
if (state == PARSE_MACRONAME && "//".equals(b.toString())) { if (state == PARSE_MACRONAME && "//".equals(b.toString())) {
isCommentMacro = true; isCommentMacro = true;
// search macro end tag // just continue parsing the macro as this is the only way
while (i < length - 1 && // to correctly catch embedded macros - see bug 588
(source[i] != '%' || source[i + 1] != '>')) {
i++;
}
state = PARSE_DONE;
break loop;
} }
break; break;