svn commit: r1059051 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/markup/html/link/ test/java/org/apache/wicket/markup/html/link/ test/java/org/apache/wicket/stateless/

mgrigorov Fri, 14 Jan 2011 08:06:33 -0800

Author: mgrigorov
Date: Fri Jan 14 16:06:00 2011
New Revision: 1059051

URL: http://svn.apache.org/viewvc?rev=1059051&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/Link.java
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
 Fri Jan 14 16:06:00 2011
@@ -21,7 +21,6 @@ import org.apache.wicket.Page;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.util.string.Strings;
 
 /**
  * Implementation of a hyperlink component. A link can be used with an anchor 
(&lt;a href...)
@@ -368,7 +367,7 @@ public abstract class Link<T> extends Ab
                                tag.getName().equalsIgnoreCase("area"))
                        {
                                // generate the href attribute
-                               tag.put("href", Strings.replaceAll(url, "&", 
"&amp;"));
+                               tag.put("href", url);
 
                                // Add any popup script
                                if (popupSettings != null)
@@ -381,7 +380,7 @@ public abstract class Link<T> extends Ab
                        else if (tag.getName().equalsIgnoreCase("script") ||
                                tag.getName().equalsIgnoreCase("style"))
                        {
-                               tag.put("src", Strings.replaceAll(url, "&", 
"&amp;"));
+                               tag.put("src", url);
                        }
                        else
                        {
@@ -401,7 +400,8 @@ public abstract class Link<T> extends Ab
                                                "onclick",
                                                "var win = 
this.ownerDocument.defaultView || this.ownerDocument.parentWindow; " +
                                                        "if (win == window) { 
window.location.href='" +
-                                                       Strings.replaceAll(url, 
"&", "&amp;") + "'; } ;return false");
+                                                       url +
+                                                       "'; } ;return false");
                                }
                        }
 

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
 Fri Jan 14 16:06:00 2011
@@ -16,7 +16,7 @@
 <wicket:link autolink="false">
   <a href="../../Page1.html">Home</a>
   <wicket:link autolink="true">
-    <a 
href="org.apache.wicket.markup.html.link.Page1?id=123&amp;amp;name=test">Home</a>
+    <a 
href="org.apache.wicket.markup.html.link.Page1?id=123&amp;name=test">Home</a>
   </wicket:link>
 </wicket:link>
 <!-- valid till the end of the document or the next link tag -->

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
 Fri Jan 14 16:06:00 2011
@@ -16,7 +16,7 @@
 
   <a href="../../Page1.html">Home</a>
   
-    <a 
href="org.apache.wicket.markup.html.link.Page1?id=123&amp;amp;name=test">Home</a>
+    <a 
href="org.apache.wicket.markup.html.link.Page1?id=123&amp;name=test">Home</a>
   
 
 <!-- valid till the end of the document or the next link tag -->

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
 Fri Jan 14 16:06:00 2011
@@ -15,7 +15,7 @@
 <html xmlns:wicket>
 <body>
   <a wicket:id="defaulthompage" href="../.."></a>
-  <a wicket:id="defaulthompagewithparams" 
href="../..?param1=1&amp;amp;param2=test"></a>
+  <a wicket:id="defaulthompagewithparams" 
href="../..?param1=1&amp;param2=test"></a>
   <a wicket:id="defaulthompagewithpagemap" href="../.."></a>
 </body>
 </html>

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
 Fri Jan 14 16:06:00 2011
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a 
href="stateless?0-1.ILinkListener-link&amp;amp;testParam1=testValue1&amp;amp;testParam2=testValue2"
 wicket:id="link">test</a>
+<a 
href="stateless?0-1.ILinkListener-link&amp;testParam1=testValue1&amp;testParam2=testValue2"
 wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html?rev=1059051&r1=1059050&r2=1059051&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
 Fri Jan 14 16:06:00 2011
@@ -1,5 +1,5 @@
 <html>
 <body>
-<a 
href="org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&amp;amp;testParam1=testValue1&amp;amp;testParam2=testValue2"
 wicket:id="link">test</a>
+<a 
href="org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&amp;testParam1=testValue1&amp;testParam2=testValue2"
 wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file

svn commit: r1059051 - in /wicket/trunk/wicket-core/src: main/java/org/apache/wicket/markup/html/link/ test/java/org/apache/wicket/markup/html/link/ test/java/org/apache/wicket/stateless/

Reply via email to