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 2008/11/06 08:49:13 UTC
svn commit: r711785 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form:
CheckBoxMultipleChoice.java RadioChoice.java
Author: ivaynberg
Date: Wed Nov 5 23:49:12 2008
New Revision: 711785
URL: http://svn.apache.org/viewvc?rev=711785&view=rev
Log:
WICKET-1900
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=711785&r1=711784&r2=711785&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java Wed Nov 5 23:49:12 2008
@@ -434,7 +434,7 @@
}
CharSequence escaped;
- if (isEscapeLabelMarkup() || getEscapeModelStrings())
+ if (getEscapeModelStrings())
{
escaped = Strings.escapeMarkup(display, false, true);
}
@@ -466,6 +466,6 @@
@Deprecated
protected final boolean isEscapeLabelMarkup()
{
- return true;
+ return getEscapeModelStrings();
}
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=711785&r1=711784&r2=711785&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Wed Nov 5 23:49:12 2008
@@ -512,7 +512,15 @@
{
display = getLocalizer().getString(label, this, label);
}
- CharSequence escaped = Strings.escapeMarkup(display, false, true);
+ final CharSequence escaped;
+ if (getEscapeModelStrings())
+ {
+ escaped = Strings.escapeMarkup(display, false, true);
+ }
+ else
+ {
+ escaped = display;
+ }
buffer.append("<label for=\"").append(idAttr).append("\">").append(escaped).append(
"</label>");