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

Fix Mailer error messages not displaying in previews [MAILPOET-1662]

Browse Source
This commit is contained in:
wxa
2018-11-28 10:36:29 +03:00
parent 061c8c2d28
commit 758711c722
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/Newsletters.php
View File

@ -358,7 +358,7 @@ class Newsletters extends APIEndpoint {
if($result['response'] === false) { if($result['response'] === false) {
$error = sprintf( $error = sprintf(
__('The email could not be sent: %s', 'mailpoet'), __('The email could not be sent: %s', 'mailpoet'),
$result['error_message'] $result['error']->getMessage()
); );
return $this->errorResponse(array(APIError::BAD_REQUEST => $error)); return $this->errorResponse(array(APIError::BAD_REQUEST => $error));
} else { } else {

7
tests/integration/API/JSON/v1/NewslettersTest.php
View File

@ -799,7 +799,12 @@ class NewslettersTest extends \MailPoetTest {
expect($subscriber)->equals($subscriber); expect($subscriber)->equals($subscriber);
return array( return array(
'response' => false, 'response' => false,
'error_message' => 'failed' 'error' => Stub::make(
'\MailPoet\Mailer\MailerError',
array(
'getMessage' => 'failed'
)
)
); );
} }
) )