From aeb6689d5dcd2d1655236f9abda2ca0c5b794ce7 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@gerv.net>
Date: Fri, 7 Aug 2015 11:12:57 +0100
Subject: Bug 1191255 - Remove requirement to specify SMTP server during
 installation on Windows. r=LpSolit, a=simon

---
 Bugzilla/Config/Common.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Config')

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index 95b1e3189..6f0c0d470 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -252,7 +252,7 @@ sub check_mail_delivery_method {
     my $check = check_multi(@_);
     return $check if $check;
     my $mailer = shift;
-    if ($mailer eq 'sendmail' and ON_WINDOWS) {
+    if ($mailer eq 'Sendmail' and ON_WINDOWS) {
         # look for sendmail.exe 
         return "Failed to locate " . SENDMAIL_EXE
             unless -e SENDMAIL_EXE;
@@ -299,6 +299,8 @@ sub check_smtp_server {
     my $host = shift;
     my $port;
 
+    return '' unless $host;
+
     if ($host =~ /:/) {
         ($host, $port) = split(/:/, $host, 2);
         unless ($port && detaint_natural($port)) {
-- 
cgit v1.2.3-24-g4f1b