Updated Branches: refs/heads/master dd187fce1 -> fabec75c3
WICKET-5450 Double escaping when using EnumChoiceRenderer and DropDownChoice (cherry picked from commit 3994cb3aa04e5b4d0fd5b8f015a1d53a5c8b1c4b) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fabec75c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fabec75c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fabec75c Branch: refs/heads/master Commit: fabec75c34a5d8487be29ec5df1db30f3093af99 Parents: dd187fc Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Wed Dec 18 11:13:07 2013 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed Dec 18 11:13:26 2013 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/form/EnumChoiceRenderer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fabec75c/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java index 3ae1e9e..563e855 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java @@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form; import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.util.lang.Classes; -import org.apache.wicket.util.string.Strings; /** * {@link IChoiceRenderer} implementation that makes it easy to work with java 5 enums. This @@ -108,7 +107,7 @@ public class EnumChoiceRenderer<T extends Enum<T>> implements IChoiceRenderer<T> */ protected CharSequence postprocess(String value) { - return Strings.escapeMarkup(value); + return value; } /** {@inheritDoc} */
