You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/04/15 10:05:00 UTC
svn commit: r1092620 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket: Component.java
markup/ComponentTag.java
Author: mgrigorov
Date: Fri Apr 15 08:05:00 2011
New Revision: 1092620
URL: http://svn.apache.org/viewvc?rev=1092620&view=rev
Log:
WICKET-3608 Revert the fix. It breaks few tests
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=1092620&r1=1092619&r2=1092620&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 Fri Apr 15 08:05:00 2011
@@ -3931,7 +3931,7 @@ public abstract class Component
// Write the tag
tag.writeOutput(getResponse(), !needToRenderTag(null),
- getMarkup().getMarkupResourceStream().getWicketNamespace(), getEscapeModelStrings());
+ getMarkup().getMarkupResourceStream().getWicketNamespace());
}
}
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=1092620&r1=1092619&r2=1092620&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 Fri Apr 15 08:05:00 2011
@@ -668,7 +668,7 @@ public class ComponentTag extends Markup
* @param escapeAttributeValue
*/
public final void writeOutput(final Response response, final boolean stripWicketAttributes,
- final String namespace, final boolean escapeAttributeValue)
+ final String namespace)
{
response.write("<");
@@ -710,10 +710,7 @@ public class ComponentTag extends Markup
if (value != null)
{
response.write("=\"");
- if (escapeAttributeValue)
- {
- value = Strings.escapeMarkup(value);
- }
+ value = Strings.escapeMarkup(value);
response.write(value);
response.write("\"");
}