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

Does not display unprocessed subscriber when sending a test message

Browse Source
This commit is contained in:
Vlad
2017-02-24 11:07:46 -05:00
parent 9c27384ba3
commit d14ecc982b
7 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Mailer/Methods/SMTP.php
View File

@@ -48,7 +48,7 @@ class SMTP {
}
return ($result === 1) ?
Mailer::formatMailerSendSuccessResult() :
Mailer::formatMailerSendErrorResult($this->processLogMessage($subscriber));
Mailer::formatMailerSendErrorResult($this->processLogMessage($subscriber, $extra_params));
}
function buildMailer() {
@@ -105,7 +105,7 @@ class SMTP {
);
}
function processLogMessage($subscriber, $log = false) {
function processLogMessage($subscriber, $extra_params = array(), $log = false) {
$log = ($log) ? $log : $this->mailer_logger->dump();
// extract error message from log
preg_match('/!! (.*?)>>/ism', $log, $message);
@@ -116,7 +116,9 @@ class SMTP {
} else {
$message = sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SMTP);
}
$message .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber);
if(empty($extra_params['test_email'])) {
$message .= sprintf(' %s: %s', __('Unprocessed subscriber', 'mailpoet'), $subscriber);
}
return $message;
}