You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/04/12 07:38:05 UTC

svn commit: r1091299 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket: Component.java markup/ComponentTag.java

Author: ivaynberg
Date: Tue Apr 12 05:38:05 2011
New Revision: 1091299

URL: http://svn.apache.org/viewvc?rev=1091299&view=rev
Log:
applying martin's patch that syncs attribute escaping with component.setescapemodelstrings()
Issue: WICKET-3608

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1091299&r1=1091298&r2=1091299&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Tue Apr 12 05:38:05 2011
@@ -3931,7 +3931,7 @@ public abstract class Component
 
 			// Write the tag
 			tag.writeOutput(getResponse(), !needToRenderTag(null),
-				getMarkup().getMarkupResourceStream().getWicketNamespace());
+				getMarkup().getMarkupResourceStream().getWicketNamespace(), getEscapeModelStrings());
 		}
 	}
 

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java?rev=1091299&r1=1091298&r2=1091299&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/ComponentTag.java Tue Apr 12 05:38:05 2011
@@ -665,9 +665,10 @@ public class ComponentTag extends Markup
 	 *            if true, wicket:id are removed from output
 	 * @param namespace
 	 *            Wicket's namespace to use
+	 * @param escapeAttributeValue
 	 */
 	public final void writeOutput(final Response response, final boolean stripWicketAttributes,
-		final String namespace)
+		final String namespace, final boolean escapeAttributeValue)
 	{
 		response.write("<");
 
@@ -709,7 +710,10 @@ public class ComponentTag extends Markup
 					if (value != null)
 					{
 						response.write("=\"");
-						value = Strings.escapeMarkup(value);
+						if (escapeAttributeValue)
+						{
+							value = Strings.escapeMarkup(value);
+						}
 						response.write(value);
 						response.write("\"");
 					}