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

Merge pull request #1505 from mailpoet/sending-erros-levels

Browse Source 
Multiple Sending Error Levels [MAILPOET-1154]
This commit is contained in:
Michelle Shull
2018-09-24 07:09:39 -04:00
committed by GitHub
parent acc7100109 f5c9d0f7db
commit 5614a7a4b2
38 changed files with 1045 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/JSON/v1/Mailer.php
View File

@ -21,10 +21,7 @@ class Mailer extends APIEndpoint {
(isset($data['sender'])) ? $data['sender'] : false,
(isset($data['reply_to'])) ? $data['reply_to'] : false
);
$extra_params = array(
'test_email' => true
);
$result = $mailer->send($data['newsletter'], $data['subscriber'], $extra_params);
$result = $mailer->send($data['newsletter'], $data['subscriber']);
} catch(\Exception $e) {
return $this->errorResponse(array(
$e->getCode() => $e->getMessage()
@ -34,7 +31,7 @@ class Mailer extends APIEndpoint {
if($result['response'] === false) {
$error = sprintf(
__('The email could not be sent: %s', 'mailpoet'),
$result['error_message']
$result['error']->getMessage()
);
return $this->errorResponse(array(APIError::BAD_REQUEST => $error));
} else {
@ -46,4 +43,4 @@ class Mailer extends APIEndpoint {
MailerLog::resumeSending();
return $this->successResponse(null);
}
}
}