You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by eh...@apache.org on 2004/03/03 21:16:29 UTC
cvs commit: jakarta-tapestry/framework/src/org/apache/tapestry/parse TemplateParser.java
ehatcher 2004/03/03 12:16:28
Modified: framework/src/org/apache/tapestry/parse TemplateParser.java
Log:
fix for #26868
Revision Changes Path
1.20 +3 -4 jakarta-tapestry/framework/src/org/apache/tapestry/parse/TemplateParser.java
Index: TemplateParser.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/org/apache/tapestry/parse/TemplateParser.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TemplateParser.java 19 Feb 2004 17:37:41 -0000 1.19
+++ TemplateParser.java 3 Mar 2004 20:16:28 -0000 1.20
@@ -888,8 +888,9 @@
// Check for invisible localizations
String localizationKey = findValueCaselessly(LOCALIZATION_KEY_ATTRIBUTE_NAME, _attributes);
+ String jwcId = findValueCaselessly(JWCID_ATTRIBUTE_NAME, _attributes);
- if (localizationKey != null && tagName.equalsIgnoreCase("span"))
+ if (localizationKey != null && tagName.equalsIgnoreCase("span") && jwcId == null)
{
if (_ignoring)
templateParseProblem(
@@ -940,8 +941,6 @@
return;
}
-
- String jwcId = findValueCaselessly(JWCID_ATTRIBUTE_NAME, _attributes);
if (jwcId != null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org