niallp 2004/07/31 20:00:28
Modified: src/share/org/apache/struts/taglib/html LinkTag.java
Log:
Correct problems caused by applying patch for Bug 30300 (tests failed whoops!)
Revision Changes Path
1.38 +13 -9
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- LinkTag.java 1 Aug 2004 01:55:57 -0000 1.37
+++ LinkTag.java 1 Aug 2004 03:00:28 -0000 1.38
@@ -319,17 +319,21 @@
public int doStartTag() throws JspException {
// Generate the opening anchor element
- StringBuffer results = new StringBuffer("<a ");
+ StringBuffer results = new StringBuffer("<a");
+
// Special case for name anchors
if (linkName != null) {
results.append(" name=\"");
results.append(linkName);
results.append("\"");
- }
+ }
// * @since Struts 1.1
- results.append(" href=\"");
- results.append(calculateURL());
- results.append("\"");
+ if (linkName == null || forward != null || href != null ||
+ page != null || action != null) {
+ results.append(" href=\"");
+ results.append(calculateURL());
+ results.append("\"");
+ }
if (target != null) {
results.append(" target=\"");
results.append(target);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
