From b203834cff14b31be20ef31da56d74cf1a615327 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Tue, 10 Jan 2023 13:21:52 -0500
Subject: [PATCH] closes core#4070 - respect default return path
---
ext/flexmailer/src/Listener/BounceTracker.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ext/flexmailer/src/Listener/BounceTracker.php b/ext/flexmailer/src/Listener/BounceTracker.php
index 210fea22dfa..e3c3dd11251 100644
--- a/ext/flexmailer/src/Listener/BounceTracker.php
+++ b/ext/flexmailer/src/Listener/BounceTracker.php
@@ -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']);
--
GitLab