Index: /trac/vendor/current/templates/ticket.cs
===================================================================
--- /trac/vendor/current/templates/ticket.cs	(revision 2996)
+++ /trac/vendor/current/templates/ticket.cs	(revision 2997)
@@ -87,6 +87,5 @@
  /if ?><?cs
  if trac.acl.TICKET_MODIFY ?>
-  <form method="get" action="<?cs var:cgi_location?>/attachment/ticket/<?cs
-    var:ticket.id ?>">
+  <form method="get" action="<?cs var:ticket.attach_href ?>">
    <div><input type="submit" value="Attach File" /></div>
   </form><?cs
Index: /trac/vendor/current/templates/wiki.cs
===================================================================
--- /trac/vendor/current/templates/wiki.cs	(revision 2996)
+++ /trac/vendor/current/templates/wiki.cs	(revision 2997)
@@ -227,6 +227,5 @@
       <input type="submit" value="Edit This Page" />
      </div></form>
-     <form method="get" action="<?cs var:cgi_location?>/attachment/wiki/<?cs
-       var:wiki.namedoublequoted ?>"><div>
+     <form method="get" action="<?cs var:wiki.attach_href ?>"><div>
       <input type="submit" value="Attach File" />
      </div></form>