svn commit: r1059056 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java

[mgrigorov]

Author: mgrigorov
Date: Fri Jan 14 16:11:53 2011
New Revision: 1059056

URL: http://svn.apache.org/viewvc?rev=1059056&view=rev
Log:
WICKET-3333 Links with multiple parameters are wrongly generated
WICKET-2829 Tag attributes values are not escaped properly during writeOutput

Don't XML escape the link url. It is escaped in a central place (see 
WICKET-2829)

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java?rev=1059056&r1=1059055&r2=1059056&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/InlineFrame.java
 Fri Jan 14 16:11:53 2011
@@ -21,7 +21,6 @@ import org.apache.wicket.Session;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.string.Strings;
 
 /**
  * Implementation of an <a 
href="http://www.w3.org/TR/REC-html40/present/frames.html#h-16.5";>inline
@@ -176,7 +175,7 @@ public class InlineFrame extends WebMark
                CharSequence url = getURL();
 
                // generate the src attribute
-               tag.put("src", Strings.replaceAll(url, "&", "&amp;"));
+               tag.put("src", url);
 
                super.onComponentTag(tag);
        }