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

Prevent showing mailer errors to subscribers

Browse Source 
[MAILPOET-2120]
This commit is contained in:
Pavel Dohnal
2019-06-26 13:38:00 +02:00
committed by M. Shull
parent f8e33bae70
commit 62a7d17582
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Subscribers/ConfirmationEmailMailer.php
View File

@@ -117,12 +117,12 @@ class ConfirmationEmailMailer {
$this->mailer->getReplyToNameAndAddress($reply_to); $this->mailer->getReplyToNameAndAddress($reply_to);
$result = $this->mailer->send($email, $subscriber); $result = $this->mailer->send($email, $subscriber);
if ($result['response'] === false) { if ($result['response'] === false) {
$subscriber->setError($result['error'] instanceof MailerError ? $result['error']->getMessage() : 'Unknown Error.'); $subscriber->setError(__('Something went wrong with your subscription. Please contact the website owner.', 'mailpoet'));
return false; return false;
}; };
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
$subscriber->setError($e->getMessage()); $subscriber->setError(__('Something went wrong with your subscription. Please contact the website owner.', 'mailpoet'));
return false; return false;
} }
} }

2
tests/integration/Subscribers/ConfirmationEmailMailerTest.php
View File

@@ -69,7 +69,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
$sender->sendConfirmationEmail($subscriber); $sender->sendConfirmationEmail($subscriber);
// error is set on the subscriber model object // error is set on the subscriber model object
expect($subscriber->getErrors()[0])->equals('send error'); expect($subscriber->getErrors()[0])->equals('Something went wrong with your subscription. Please contact the website owner.');
} }
function testItDoesntSendWhenMSSIsActiveAndConfirmationEmailIsNotAuthorized() { function testItDoesntSendWhenMSSIsActiveAndConfirmationEmailIsNotAuthorized() {