svn commit: r571362 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java

[ivaynberg]

Author: ivaynberg
Date: Thu Aug 30 20:54:13 2007
New Revision: 571362

URL: http://svn.apache.org/viewvc?rev=571362&view=rev
Log:
WICKET-881 escape strings only when specified

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=571362&r1=571361&r2=571362&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
 Thu Aug 30 20:54:13 2007
@@ -388,7 +388,11 @@
                {
                        display = getLocalizer().getString(displayValue, this, 
displayValue);
                }
-               CharSequence escaped = Strings.escapeMarkup(display, false, 
true);
+               CharSequence escaped = display;
+               if (getEscapeModelStrings())
+               {
+                       escaped = Strings.escapeMarkup(display, false, true);
+               }
                buffer.append(escaped);
                buffer.append("</option>");
        }