Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix silent errors in confirmation mailer

Browse Source 
[MAILPOET-1987]
This commit is contained in:
Rostislav Wolny
2019-05-10 10:20:01 +02:00
committed by M. Shull
parent 67b90ca228
commit aa105effc7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Subscribers/ConfirmationEmailMailer.php
View File

@@ -4,6 +4,7 @@ namespace MailPoet\Subscribers;
use Html2Text\Html2Text; use Html2Text\Html2Text;
use MailPoet\Mailer\Mailer; use MailPoet\Mailer\Mailer;
use MailPoet\Mailer\MailerError;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Url; use MailPoet\Subscription\Url;
@@ -106,7 +107,12 @@ class ConfirmationEmailMailer {
} }
$this->mailer->getSenderNameAndAddress($from); $this->mailer->getSenderNameAndAddress($from);
$this->mailer->getReplyToNameAndAddress($reply_to); $this->mailer->getReplyToNameAndAddress($reply_to);
return $this->mailer->send($email, $subscriber); $result = $this->mailer->send($email, $subscriber);
if ($result['response'] === false) {
$subscriber->setError($result['error'] instanceof MailerError ? $result['error']->getMessage() : 'Unknown Error.');
return false;
};
return true;
} catch (\Exception $e) { } catch (\Exception $e) {
$subscriber->setError($e->getMessage()); $subscriber->setError($e->getMessage());
return false; return false;