Omit prefix and suffix when writing out default macro value as suggested in
http://www.helma.org/bugs/show_bug.cgi?id=267#c1
This commit is contained in:
parent
7dc1bb8a2f
commit
2014f13cfd
1 changed files with 4 additions and 2 deletions
|
@ -625,7 +625,9 @@ public final class Skin {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((text != null) && (text.length() > 0)) {
|
if ((text != null) && (text.length() > 0)) {
|
||||||
if (prefix != null) {
|
// only write prefix/suffix if value is not null, if we write the default
|
||||||
|
// value provided by the macro tag, we assume it's already complete
|
||||||
|
if (prefix != null && value != null) {
|
||||||
buffer.append(prefix);
|
buffer.append(prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -661,7 +663,7 @@ public final class Skin {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (suffix != null) {
|
if (suffix != null && value != null) {
|
||||||
buffer.append(suffix);
|
buffer.append(suffix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue