Author: mgrigorov
Date: Fri Jan 14 16:10:24 2011
New Revision: 1059055
URL: http://svn.apache.org/viewvc?rev=1059055&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/ExternalLink.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=1059055&r1=1059054&r2=1059055&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
Fri Jan 14 16:10:24 2011
@@ -21,7 +21,6 @@ import org.apache.wicket.markup.MarkupSt
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.string.UrlUtils;
/**
@@ -169,7 +168,7 @@ public class ExternalLink extends Abstra
tag.getName().equalsIgnoreCase("area"))
{
// generate the href attribute
- tag.put("href", Strings.replaceAll(url,
"&", "&"));
+ tag.put("href", url);
// Add any popup script
if (popupSettings != null)
