Skip to content
Snippets Groups Projects
Unverified Commit b203834c authored by JonGold's avatar JonGold
Browse files

closes #4070 - respect default return path

parent 3a1ed2d9
No related branches found
No related tags found
No related merge requests found
......@@ -25,6 +25,7 @@ class BounceTracker extends BaseListener {
}
$mailing = $e->getMailing();
$defaultReturnPath = \CRM_Core_BAO_MailSettings::defaultReturnPath();
foreach ($e->getTasks() as $task) {
/** @var \Civi\FlexMailer\FlexMailerTask $task */
......@@ -33,7 +34,7 @@ class BounceTracker extends BaseListener {
$task->getAddress());
if (!$task->getMailParam('Return-Path')) {
$task->setMailParam('Return-Path', $verp['bounce']);
$task->setMailParam('Return-Path', $defaultReturnPath ?? $verp['bounce']);
}
if (!$task->getMailParam('X-CiviMail-Bounce')) {
$task->setMailParam('X-CiviMail-Bounce', $verp['bounce']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment