Re-fix for bug 29820: remove "Changed" from email subject line. Based on patch submi...

UPGRADE NOTES: when you install this update, you will need to change the subject line in your 'changedmail' and 'newchangedmail' params from the web by running editparams.cgi.  The subject line needs to be changed from:
Subject: [Bug %bugid%] %neworchanged% - %summary%
to
Subject: [Bug %bugid%] %neworchanged%%summary%

Or whatever is appropriate for the subject you are using on your system.  Note the removal of the " - " in the middle.

diff --git a/defparams.pl b/defparams.pl
index 89601a4d3acd0b12adf49a571864c3b8bce4bc3c..c384eb97346d5978afa47c82329e51677c130b93 100644 (file)
--- a/defparams.pl
+++ b/defparams.pl
@@ -381,8 +381,8 @@ separated by a comma (with duplication removed, if they're the same
 person).  %cc% gets replaced by the list of people on the CC list,
 separated by commas.  %bugid% gets replaced by the bug number.
 %diffs% gets replaced by the diff text from the old version to the new
-version of this bug.  %neworchanged% is either "New" or "Changed",
-depending on whether this mail is reporting a new bug or changes made
+version of this bug.  %neworchanged% is "New: " if this mail is
+reporting a new bug or empty if changes were made
 to an existing one.  %summary% gets replaced by the summary of this
 bug.  %<i>anythingelse</i>% gets replaced by the definition of that
 parameter (as defined on this page).},
@@ -390,7 +390,7 @@ parameter (as defined on this page).},
 "From: bugzilla-daemon
 To: %to%
 Cc: %cc%
-Subject: [Bug %bugid%] %neworchanged% - %summary%
+Subject: [Bug %bugid%] %neworchanged%%summary%
 
 %urlbase%show_bug.cgi?id=%bugid%
 
@@ -418,7 +418,7 @@ q{The same as 'changedmail', but used for the newemailtech stuff.},
 "From: bugzilla-daemon
 To: %to%
 Cc: %cc%
-Subject: [Bug %bugid%] %neworchanged% - %summary%
+Subject: [Bug %bugid%] %neworchanged%%summary%
 
 %urlbase%show_bug.cgi?id=%bugid%
 

diff --git a/processmail b/processmail
index c34b45b1547be0e7552c91446cd8d7d59277f148..c9e006d4e60f72aa0ff507978e9d5be217d3dccc 100755 (executable)
--- a/processmail
+++ b/processmail
@@ -949,7 +949,7 @@ sub NewProcessOnePerson ($$$$$$$$$$) {
 # since if the bug didn't change, you wouldn't be getting mail
 # in the first place! see http://bugzilla.mozilla.org/show_bug.cgi?id=29820 
 # for details.
-    $substs{"neworchanged"} = $isnew ? "New" : "";
+    $substs{"neworchanged"} = $isnew ? 'New: ' : '';
     $substs{"to"} = $person;
     $substs{"cc"} = '';
     $substs{"bugid"} = $id;
@@ -1042,7 +1042,7 @@ sub ProcessOneBug {
                 $substs{"diffs"} .= $_;
             }
             close DIFFS;
-            $substs{"neworchanged"} = $verb;
+            $substs{"neworchanged"} = ($verb eq "New") ? "New: " : "";
             $substs{"summary"} = $::bug{'short_desc'};
             my $msg = PerformSubsts(Param("changedmail"), \%substs);