From 7a8ea3d5356b6927e3e51132a0fb2c5dc126d27e Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Sat, 12 Nov 2016 19:21:46 +0100 Subject: [PATCH] Return true/false from Mail\Service::sendMail Former-commit-id: 0f224c294f7487448e6ce73ff2d8651e2ea2d35e Former-commit-id: 8b40ddc1aec9f1a4a86d9ea5c4077b18fb125188 --- web/concrete/src/Mail/Service.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/concrete/src/Mail/Service.php b/web/concrete/src/Mail/Service.php index a6fe41aa91c..96f9a60c336 100644 --- a/web/concrete/src/Mail/Service.php +++ b/web/concrete/src/Mail/Service.php @@ -395,6 +395,8 @@ public function setAdditionalHeaders($headers) * @param bool $resetData Whether or not to reset the service to its default values. * * @throws \Exception + * + * @return bool */ public function sendMail($resetData = true) { @@ -492,10 +494,12 @@ public function sendMail($resetData = true) } $mail->setBody($body); + $sent = false; try { if (Config::get('concrete.email.enabled')) { $transport->send($mail); } + $sent = true; } catch (Exception $e) { if ($this->getTesting()) { throw $e; @@ -533,5 +537,7 @@ public function sendMail($resetData = true) if ($resetData) { $this->reset(); } + + return $sent; } }