Update the SmtpMailer to return the error that is assigned to the mai…

…l object when it fails (#22)
markguinn · Mar 21, 2017 · 64c5241 · 64c5241
1 parent 1a09edc
commit 64c5241
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/code/SmtpMailer.php b/code/SmtpMailer.php
@@ -397,15 +397,15 @@ public function sendPlain($to, $from, $subject, $plainContent, $attachedFiles =
         if ($mail->Send()) {
             return array($to, $subject, $plainContent, $customheaders);
         } else {
-            return $this-checkMailError();
+            return $this-checkMailError($mail);
         }
     }
 
     /**
      * @return bool
      * @throws \Exception if he environment is dev
      */
-    public function checkMailError()
+    public function checkMailError($mail)
     {
         if (Director::isDev()) {
             throw new \Exception(sprintf(
@@ -456,7 +456,7 @@ public function sendHTML(
         if ($mail->Send()) {
             return array($to, $subject, $htmlContent, $customheaders);
         } else {
-            return $this->checkMailError();
+            return $this->checkMailError($mail);
         }
     }
 }