Fix for bug 104521: Removes old attachment interface in favor of new attachment tracker.

Patch by Myk Melez <myk@mozilla.org>.
r=bbaetz,kiko

1 files changed, 3 insertions, 3 deletions

diff --git a/processmail b/processmail
index f47d27e3e..844942728 100755
--- a/processmail
+++ b/processmail
@@ -160,7 +160,7 @@ sub ProcessOneBug {
             $difftext .= FormatTriple("What    ", "Removed", "Added");
             $difftext .= ('-' x 76) . "\n";
         }
-        $what =~ s/^Attachment/Attachment #$attachid/ if (Param('useattachmenttracker') && $attachid);
+        $what =~ s/^Attachment/Attachment #$attachid/ if $attachid;
         $difftext .= FormatTriple($what, $old, $new);
     }
 
@@ -737,9 +737,9 @@ sub NewProcessOnePerson ($$$$$$$$$$$$) {
     if ( $newcomments =~ /Created an attachment \(/ ) {
 
         my $showattachurlbase =
-            Param('urlbase') . "showattachment.cgi?attach_id=";
+            Param('urlbase') . "attachment.cgi?id=";
 
-        $newcomments =~ s/(Created an attachment \(id=([0-9]+)\))/$1\n --> \(${showattachurlbase}$2\)/g;
+        $newcomments =~ s/(Created an attachment \(id=([0-9]+)\))/$1\n --> \(${showattachurlbase}$2&action=view\)/g;
     }
 
     $person .= Param('emailsuffix');