Fix for bug 232659: Fix inconsistent attachment links (and clean up diff

viewer UI while we're at it). Do just that. r=myk, a=myk.

1 files changed, 3 insertions, 4 deletions

diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index a05945df0..a4888f80d 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -247,9 +247,9 @@
       [% IF isviewable %]
         <td width="75%">
           <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea>
-          <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]&amp;action=view" style="height: 400px; width: 100%;">
+          <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]" style="height: 400px; width: 100%;">
             <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs.
-            <a href="attachment.cgi?id=[% attachid %]&amp;action=view">View the attachment on a separate page</a>.</b>
+            <a href="attachment.cgi?id=[% attachid %]">View the attachment on a separate page</a>.</b>
           </iframe>
           <script type="application/x-javascript" language="JavaScript">
             <!--
@@ -276,8 +276,7 @@
             able to display.
           </b></p>
           <p><b>
-            <a href="attachment.cgi?id=[% attachid %]&amp;action=view">Download
-            the attachment</a>.
+            <a href="attachment.cgi?id=[% attachid %]">Download the attachment</a>.
           </b></p>
         </td>
       [% END %]