Bug 284629 : Combine Param(enable_mail_sending) with Param(maildeliverymethod)

Patch by Shane H. W. Travis <travis@sedsystems.ca>  r=Jake  a=myk

1 files changed, 3 insertions, 3 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 7fda5c978..1464e8516 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1282,10 +1282,10 @@ if (@oldparams) {
     close PARAMFILE;
 }
 
-# Set maildeliverymethod to SMTP and prompt for SMTP server
+# Set mail_delivery_method to SMTP and prompt for SMTP server
 # if running on Windows and set to sendmail (Mail::Mailer doesn't
 # support sendmail on Windows)
-if ($^O =~ /MSWin32/i && Param('maildeliverymethod') eq 'sendmail') {
+if ($^O =~ /MSWin32/i && Param('mail_delivery_method') eq 'sendmail') {
     print "\nBugzilla requires an SMTP server to function on Windows.\n" .
         "Please enter your SMTP server's hostname: ";
     my $smtp = $answer{'SMTP_SERVER'} 
@@ -1296,7 +1296,7 @@ if ($^O =~ /MSWin32/i && Param('maildeliverymethod') eq 'sendmail') {
         print "\nWarning: No SMTP Server provided, defaulting to localhost\n";
         $smtp = 'localhost';
     }
-    SetParam('maildeliverymethod', 'smtp');
+    SetParam('mail_delivery_method', 'smtp');
     SetParam('smtpserver', $smtp);
 }