Improve check for SMTP close on destruct, fixes PHPMailer#658

Synchro · Mar 18, 2016 · 33c33b5 · 33c33b5
1 parent 99bf646
commit 33c33b5
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -645,9 +645,7 @@ public function __construct($exceptions = false)
     public function __destruct()
     {
         //Close any open SMTP connection nicely
-        if ($this->Mailer == 'smtp') {
-            $this->smtpClose();
-        }
+        $this->smtpClose();
     }
 
     /**
@@ -1634,7 +1632,7 @@ public function smtpConnect($options = array())
      */
     public function smtpClose()
     {
-        if ($this->smtp !== null) {
+        if (is_a($this->smtp, 'SMTP')) {
             if ($this->smtp->connected()) {
                 $this->smtp->quit();
                 $this->smtp->close();