Backing out the fix for bug 135812 as it causes the mail params to be deleted on new installs.

1 files changed, 4 insertions, 16 deletions

diff --git a/defparams.pl b/defparams.pl
index 30e7ed72a..5e2110d61 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -308,14 +308,6 @@ sub find_languages {
   },
 
   {
-   name => 'mailfrom',
-   desc => 'The email address of the Bugzilla mail daemon.  Some email systems ' .
-           'require this to be a valid email address.',
-   type => 't',
-   default => 'bugzilla-daemon'
-  },
-
-  {
    name => 'urlbase',
    desc => 'The URL that is the common initial leading part of all Bugzilla ' .
            'URLs.',
@@ -726,10 +718,9 @@ sub find_languages {
            'password.  %<i>anythingelse</i>% gets replaced by the ' .
            'definition of that parameter (as defined on this page).',
    type => 'l',
-   default => 'From: %mailfrom%
+   default => 'From: bugzilla-daemon
 To: %mailaddress%
 Subject: Your Bugzilla password.
-X-Bugzilla-Type: admin
 
 To use the wonders of Bugzilla, you can use the following:
 
@@ -762,12 +753,11 @@ To use the wonders of Bugzilla, you can use the following:
            'replaced by the definition of that parameter (as defined on ' .
            'this page).',
    type => 'l',
-   default => 'From: %mailfrom%
+   default => 'From: bugzilla-daemon
 To: %to%
 Subject: [Bug %bugid%] %neworchanged%%summary%
 %threadingmarker%
 X-Bugzilla-Reason: %reasonsheader%
-X-Bugzilla-Type: newchanged
 
 %urlbase%show_bug.cgi?id=%bugid%
 
@@ -799,10 +789,9 @@ Configure bugmail: %urlbase%userprefs.cgi?tab=email
            'address, so that if the mail bounces, a real person can know '.
            'that there are bugs assigned to an invalid address.',
    type => 'l',
-   default => 'From: %mailfrom%
+   default => 'From: %maintainer%
 To: %email%
 Subject: Your Bugzilla buglist needs attention.
-X-Bugzilla-Type: whine
 
 [This e-mail has been automatically generated.]
 
@@ -1043,10 +1032,9 @@ You will get this message once a day until you\'ve dealt with these bugs!
            'compatibility. %<i>anythingelse</i>% gets replaced by the ' .
            'definition of that parameter (as defined on this page).',
    type => 'l',
-   default => 'From: %mailfrom%
+   default => 'From: bugzilla-daemon
 To: %to%
 Subject: [Bug %bugid%] Some or all of your votes have been removed.
-X-Bugzilla-Type: voteremoved
 
 Some or all of your votes have been removed from bug %bugid%.