Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CiviCRM Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
CiviCRM Core
Commits
b203834c
Unverified
Commit
b203834c
authored
2 years ago
by
JonGold
Browse files
Options
Downloads
Patches
Plain Diff
closes
#4070
- respect default return path
parent
3a1ed2d9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ext/flexmailer/src/Listener/BounceTracker.php
+2
-1
2 additions, 1 deletion
ext/flexmailer/src/Listener/BounceTracker.php
with
2 additions
and
1 deletion
ext/flexmailer/src/Listener/BounceTracker.php
+
2
−
1
View file @
b203834c
...
...
@@ -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'
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment