Flexmailer: Prevent broken urls containing hyphens when click tracking is enabled for plain text mailings #25149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
|
Looks pretty sensible to me. |
|
@larssandergreen would it be possible for you to add another case into here https://github.com/civicrm/civicrm-core/blob/master/ext/flexmailer/tests/phpunit/Civi/FlexMailer/ClickTracker/TextClickTrackerTest.php#L67 which covers the - to lock in this behaviour |
|
@larssandergreen I think we should target this patch against the 5.57 rc since we make flexmailer compulsory in that release |
larssandergreen
force-pushed
the
allow-dashes-in-tracked-URLs-for-text-in-flexmailer
branch
from
de6ee77 to
ee55b52
Compare
larssandergreen
force-pushed
the
allow-dashes-in-tracked-URLs-for-text-in-flexmailer
branch
from
ee55b52 to
8b13a9f
Compare
|
Test looks good. To my eye, the current branch is based |
|
@larssandergreen @totten merging this. Thanks! |
|
Thanks all!
…On Mon, Dec 12, 2022 at 9:55 PM Yashodha Chaku ***@***.***> wrote:
Merged #25149 <#25149> into
5.57.
—
Reply to this email directly, view it on GitHub
<#25149 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AGCV35DW3UDISZTZOC6HX3TWM76VNANCNFSM6AAAAAASZ2O2CU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
Merged
|
Given we are making flexmailer required I have put up a port-to-stable for this #25166 |
larssandergreen
deleted the
allow-dashes-in-tracked-URLs-for-text-in-flexmailer
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Hyphens are allowed in URLs, but the regex for plain text mailings in Flexmailer did not include hyphens. URLs of the form
example.org/wp-content/somethingwere stored for click tracking asexample.org/wp, breaking them.Before
Hyphens not included in regex.
After
Hyphens included.