craigmcc 01/04/03 11:06:24
Modified: src/share/org/apache/struts/taglib/html FormTag.java
LinkTag.java
src/share/org/apache/struts/taglib/logic RedirectTag.java
Log:
Do not call ResponseUtils.filter() on hyperlinks generated by the following
tags:
* <logic:redirect>
* <html:form>
* <html:link>
because it messes up query strings that include more then one parameter
separated by an ampersand ('&').
PR: Bugzilla #963
Submitted by: Gan Kiat Kin ([EMAIL PROTECTED])
Revision Changes Path
1.8 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
Index: FormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormTag.java 2001/03/06 22:09:52 1.7
+++ FormTag.java 2001/04/03 18:06:18 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.7
2001/03/06 22:09:52 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2001/03/06 22:09:52 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v 1.8
2001/04/03 18:06:18 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/04/03 18:06:18 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* properties correspond to the various fields of the form.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/03/06 22:09:52 $
+ * @version $Revision: 1.8 $ $Date: 2001/04/03 18:06:18 $
*/
public class FormTag extends TagSupport {
@@ -450,8 +450,7 @@
results.append(" method=\"");
results.append(method);
results.append("\" action=\"");
- results.append
- (response.encodeURL(ResponseUtils.filter(getActionMappingURL())));
+ results.append(response.encodeURL(getActionMappingURL()));
results.append("\"");
if (styleClass != null) {
results.append(" class=\"");
1.7 +5 -6
jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java
Index: LinkTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LinkTag.java 2001/03/10 23:55:38 1.6
+++ LinkTag.java 2001/04/03 18:06:19 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.6
2001/03/10 23:55:38 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/03/10 23:55:38 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/LinkTag.java,v 1.7
2001/04/03 18:06:19 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/04/03 18:06:19 $
*
* ====================================================================
*
@@ -77,7 +77,6 @@
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionForwards;
-import org.apache.struts.util.BeanUtils;
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.PropertyUtils;
import org.apache.struts.util.RequestUtils;
@@ -87,7 +86,7 @@
* Generate a URL-encoded hyperlink to the specified URI.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/03/10 23:55:38 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/03 18:06:19 $
*/
public class LinkTag extends BaseHandlerTag {
@@ -317,7 +316,7 @@
String hyperlink = hyperlink();
if (hyperlink != null) {
results.append(" href=\"");
- results.append(response.encodeURL(BeanUtils.filter(hyperlink)));
+ results.append(response.encodeURL(hyperlink));
results.append("\"");
}
if (linkName != null) {
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java
Index: RedirectTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RedirectTag.java 2001/02/12 21:49:58 1.6
+++ RedirectTag.java 2001/04/03 18:06:23 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
1.6 2001/02/12 21:49:58 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/12 21:49:58 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/RedirectTag.java,v
1.7 2001/04/03 18:06:23 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/04/03 18:06:23 $
*
* ====================================================================
*
@@ -86,7 +86,7 @@
* Generate a URL-encoded redirect to the specified URI.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2001/02/12 21:49:58 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/03 18:06:23 $
*/
public class RedirectTag extends TagSupport {
@@ -269,7 +269,7 @@
// Perform the redirection
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
- String hyperlink = ResponseUtils.filter(hyperlink());
+ String hyperlink = hyperlink();
try {
response.sendRedirect(response.encodeRedirectURL(hyperlink));
} catch (IOException e) {
