From: terry%mozilla.org <>
Date: Wed, 15 Sep 1999 19:26:57 +0000 (+0000)
Subject: Whining mail wasn't generated correctly if usernames != email addresses.
X-Git-Tag: bugzilla-2.8~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20269fbbc7fe9226f2ed8a4c0470d7c84b795591;p=thirdparty%2Fbugzilla.git

Whining mail wasn't generated correctly if usernames != email addresses.
---

diff --git a/defparams.pl b/defparams.pl
index da8cf2afa4..ee85802e8f 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -193,7 +193,7 @@ DefParam("whinedays",
 
 
 DefParam("whinemail",
-         "The email that gets sent to anyone who has a NEW bug that hasn't been touched for more than <b>whinedays</b>.  Within this text, %email% gets replaced by the offender's email address.  %<i>anythingelse</i>% gets replaced by the definition of that parameter (as defined on this page).<p> It is a good idea to make sure this message has a valid From: address, so that if the mail bounces, a real person can know that there are bugs assigned to an invalid address.",
+         "The email that gets sent to anyone who has a NEW bug that hasn't been touched for more than <b>whinedays</b>.  Within this text, %email% gets replaced by the offender's email address.  %userid% gets replaced by the offender's bugzilla login (which, in most installations, is the same as the email address.)  %<i>anythingelse</i>% gets replaced by the definition of that parameter (as defined on this page).<p> It is a good idea to make sure this message has a valid From: address, so that if the mail bounces, a real person can know that there are bugs assigned to an invalid address.",
          "l",
          q{From: %maintainer%
 To: %email%
@@ -222,7 +222,7 @@ Generally, this means one of three things:
 
 To get a list of all NEW bugs, you can use this URL (bookmark it if you like!):
 
-    %urlbase%buglist.cgi?bug_status=NEW&assigned_to=%email%
+    %urlbase%buglist.cgi?bug_status=NEW&assigned_to=%userid%
 
 Or, you can use the general query page, at
 %urlbase%query.cgi.
diff --git a/whineatnews.pl b/whineatnews.pl
index 6be5f895e2..59a794739e 100755
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -55,6 +55,7 @@ my $emailsuffix = Param('emailsuffix');
 foreach my $email (sort (keys %bugs)) {
     my %substs;
     $substs{'email'} = $email . $emailsuffix;
+    $substs{'userid'} = $email;
     my $msg = PerformSubsts($template, \%substs);
 
     foreach my $i (@{$bugs{$email}}) {