From 5d96fa703d3d9a17b39c910f3f00c6bf60b0363c Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 20 Sep 2014 14:17:14 +0200
Subject: Bug 502625: Replace Email::Send with Email::Sender r=dylan a=glob

---
 Bugzilla/Config.pm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'Bugzilla/Config.pm')

diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 7ec80e1ab..fdbedbdc0 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -185,16 +185,19 @@ sub update_params {
     }
 
     # Old mail_delivery_method choices contained no uppercase characters
-    if (exists $param->{'mail_delivery_method'}
-        && $param->{'mail_delivery_method'} !~ /[A-Z]/) {
-        my $method = $param->{'mail_delivery_method'};
-        my %translation = (
-            'sendmail' => 'Sendmail',
-            'smtp'     => 'SMTP',
-            'qmail'    => 'Qmail',
-            'testfile' => 'Test',
-            'none'     => 'None');
-        $param->{'mail_delivery_method'} = $translation{$method};
+    my $mta = $param->{'mail_delivery_method'};
+    if ($mta) {
+        if ($mta !~ /[A-Z]/) {
+            my %translation = (
+                'sendmail' => 'Sendmail',
+                'smtp'     => 'SMTP',
+                'qmail'    => 'Qmail',
+                'testfile' => 'Test',
+                'none'     => 'None');
+            $param->{'mail_delivery_method'} = $translation{$mta};
+        }
+        # This will force the parameter to be reset to its default value.
+        delete $param->{'mail_delivery_method'} if $param->{'mail_delivery_method'} eq 'Qmail';
     }
 
     # Convert the old "ssl" parameter to the new "ssl_redirect" parameter.
-- 
cgit v1.2.3-24-g4f1b