craigmcc 01/04/03 12:19:01
Modified: src/share/org/apache/struts/taglib/html ImageTag.java
ImgTag.java RewriteTag.java
Log:
Remove a few more cases where we were calling ResponseUtils.filter() around
hyperlinks that might have query strings with ampersands.
Revision Changes Path
1.7 +5 -5
jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java
Index: ImageTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ImageTag.java 2001/03/06 22:25:42 1.6
+++ ImageTag.java 2001/04/03 19:18:59 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v 1.6
2001/03/06 22:25:42 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2001/03/06 22:25:42 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImageTag.java,v 1.7
2001/04/03 19:18:59 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/04/03 19:18:59 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* Tag for input fields of type "image".
*
* @author Oleg V Alexeev
- * @version $Revision: 1.6 $ $Date: 2001/03/06 22:25:42 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/03 19:18:59 $
*/
public class ImageTag extends SubmitTag {
@@ -273,7 +273,7 @@
tmp = src();
if (tmp != null) {
results.append(" src=\"");
- results.append(response.encodeURL(ResponseUtils.filter(tmp)));
+ results.append(response.encodeURL(tmp));
results.append("\"");
}
tmp = alt();
1.8 +6 -7
jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ImgTag.java 2001/02/20 02:59:00 1.7
+++ ImgTag.java 2001/04/03 19:18:59 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.7
2001/02/20 02:59:00 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2001/02/20 02:59:00 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v 1.8
2001/04/03 19:18:59 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/04/03 19:18:59 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
*
* @author Michael Westbay
* @author Craig McClanahan
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class ImgTag extends BaseHandlerTag {
@@ -510,14 +510,13 @@
String srcurl = url(tmp);
if (srcurl != null) {
results.append(" src=\"");
- results.append(response.encodeURL(ResponseUtils.filter(srcurl)));
+ results.append(response.encodeURL(srcurl));
results.append("\"");
}
String lowsrcurl = url(this.lowsrc);
if (lowsrcurl != null) {
results.append(" lowsrc=\"");
- results.append
- (response.encodeURL(ResponseUtils.filter(lowsrcurl)));
+ results.append(response.encodeURL(lowsrcurl));
results.append("\"");
}
tmp = alt();
1.2 +4 -4
jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java
Index: RewriteTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RewriteTag.java 2001/01/06 21:50:39 1.1
+++ RewriteTag.java 2001/04/03 19:19:00 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v 1.1
2001/01/06 21:50:39 mschachter Exp $
- * $Revision: 1.1 $
- * $Date: 2001/01/06 21:50:39 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/RewriteTag.java,v 1.2
2001/04/03 19:19:00 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/04/03 19:19:00 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* Generate a URL-encoded URI as a string.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/01/06 21:50:39 $
+ * @version $Revision: 1.2 $ $Date: 2001/04/03 19:19:00 $
*/
public class RewriteTag extends LinkTag {
@@ -105,7 +105,7 @@
HttpServletResponse response =
(HttpServletResponse) pageContext.getResponse();
StringBuffer results = new StringBuffer();
- results.append(response.encodeURL(BeanUtils.filter(hyperlink())));
+ results.append(response.encodeURL(hyperlink()));
// Print this element to our output writer
JspWriter writer = pageContext.getOut();
