Fixing link with ampersands in email click tracking #13858
Merged
Conversation
This file contains hidden or 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
…k replacement within an email body
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 5.x #13858 +/- ##
=========================================
Coverage 62.18% 62.18%
Complexity 34220 34220
=========================================
Files 2252 2252
Lines 102328 102331 +3
=========================================
+ Hits 63628 63631 +3
Misses 38700 38700
|
escopecz
approved these changes
Jun 18, 2024
putzwasser
pushed a commit
to putzwasser/mautic
that referenced
this pull request
Jun 20, 2024
…k replacement within an email body (mautic#13858)
andersonjeccel
added a commit
to andersonjeccel/mautic
that referenced
this pull request
Jun 21, 2024
commit 3ad8223 Merge: f79216d b228705 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Jun 21 10:35:56 2024 -0300 Merge remote-tracking branch 'upstream/5.x' into ui-token-based-approach-for-interface-elements-and-colors commit f79216d Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Jun 21 10:35:19 2024 -0300 semantic fixes commit b228705 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Tue Jun 18 17:20:10 2024 +0200 Make the search regular expression match both "&" and "&" for link replacement within an email body (mautic#13858) commit 58c1903 Author: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Jun 18 11:37:28 2024 -0300 [UI] Increased icon size (mautic#13825) * increased icon size * decrease by 1px commit 2331cf3 Author: John Linhart <admin@escope.cz> Date: Tue Jun 18 14:42:43 2024 +0200 Segment membership as a new filter for dynamic email content (mautic#13528) * Merge pull request mautic#1088 from mautic-inc/MAUT-4688 Maut 4688 - Use segment membership as a filter for dynamic content in email * Changes needed after rebase to M5 * Merge pull request mautic#1407 from acquia/MAUT-5729 MAUT-5729 Dynamic Content Error - Segment Membership filter not showing correct content * Fixing STAN * CS fixes * Test fix * test fix part 2 * Adding back JS methods removed in a bad conflict resolution --------- Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit 3edfeec Author: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Jun 18 09:34:10 2024 -0300 add js code to hide profile pic if missing (mautic#13838) commit fadcf26 Author: putzwasser <26040044+putzwasser@users.noreply.github.com> Date: Tue Jun 18 12:56:34 2024 +0200 [UI] Replaces table action button `arrow-down` with `more-2` icon (mautic#13841) * [UI] Replaces table action button `arrow-down` with `more-2` icon This replaces the icon for the action toggle button in tables (e.g. contact list table or segment list table) with a 3 dot icon. The previous arrow down icon indicates that an collapsed element would get unfolded/shown. This is not the case in these tables. The button shows more actions. In any UI that I know a 3 dot icon is used for that. The arrow down icon would be more suitable if it would show more details on click. Hence, this PR. * TASK: Reverts change for `page_actions.html.twig` Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> --------- Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com>
andersonjeccel
pushed a commit
to andersonjeccel/mautic
that referenced
this pull request
Jun 24, 2024
…k replacement within an email body (mautic#13858)
andersonjeccel
added a commit
to andersonjeccel/mautic
that referenced
this pull request
Jun 24, 2024
… for link replacement within an email body (mautic#13858)" This reverts commit d3e6ceb.
escopecz
added a commit
that referenced
this pull request
Jun 27, 2024
* [UI] Replaces table action button `arrow-down` with `more-2` icon (#13841) * [UI] Replaces table action button `arrow-down` with `more-2` icon This replaces the icon for the action toggle button in tables (e.g. contact list table or segment list table) with a 3 dot icon. The previous arrow down icon indicates that an collapsed element would get unfolded/shown. This is not the case in these tables. The button shows more actions. In any UI that I know a 3 dot icon is used for that. The arrow down icon would be more suitable if it would show more details on click. Hence, this PR. * TASK: Reverts change for `page_actions.html.twig` Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> --------- Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> * add js code to hide profile pic if missing (#13838) * Segment membership as a new filter for dynamic email content (#13528) * Merge pull request #1088 from mautic-inc/MAUT-4688 Maut 4688 - Use segment membership as a filter for dynamic content in email * Changes needed after rebase to M5 * Merge pull request #1407 from acquia/MAUT-5729 MAUT-5729 Dynamic Content Error - Segment Membership filter not showing correct content * Fixing STAN * CS fixes * Test fix * test fix part 2 * Adding back JS methods removed in a bad conflict resolution --------- Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * [UI] Increased icon size (#13825) * increased icon size * decrease by 1px * Make the search regular expression match both "&" and "&" for link replacement within an email body (#13858) * Guide users to build optimized segments (#13860) * Merge pull request #2172 from acquia/MAUT-11343 MAUT-11343 : Guide users to build optimized segments * fix twig file issue * Apply suggestions from code review Co-authored-by: John Linhart <admin@escope.cz> * push suggested changes --------- Co-authored-by: John Linhart <admin@escope.cz> * fix CSS flexbox broken in campaign insert clone view * Revert "[UI] Replaces table action button `arrow-down` with `more-2` icon (#13841)" This reverts commit fadcf26. * Revert "Segment membership as a new filter for dynamic email content (#13528)" This reverts commit 71031b7. * Revert "[UI] Increased icon size (#13825)" This reverts commit c00df3c. * Revert "Make the search regular expression match both "&" and "&" for link replacement within an email body (#13858)" This reverts commit d3e6ceb. * Revert "Guide users to build optimized segments (#13860)" This reverts commit bdabc26. * Revert "add js code to hide profile pic if missing (#13838)" This reverts commit 76dd7d6. --------- Co-authored-by: putzwasser <26040044+putzwasser@users.noreply.github.com> Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> Co-authored-by: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Co-authored-by: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com>
escopecz
pushed a commit
that referenced
this pull request
Jul 15, 2024
* tokens * incorporating all bootstrap variables * migrating mautic variables into bootstrap * fixing broken darken/lighten * variables * revert removing 5x duplicated import rules revert Revert "fixing broken darken/lighten" This reverts commit bcf4ac98e07c0c17162a74794a8161d5398c3d7c. * grunt compile-less * aligning previous tokens * remove duplicated imports * dark color scheme disabled by default to avoid conflicts * utilities syntax fix * improve radius calc * tag to label token names * setting the dark theme implementation method * set implementation mode for high contrast + run grunt-compile-less * fix missing transparency bg colors * darker brand bg on dark theme * Responsive typography * secondary brand color support * style fixes * fixes for secondary brand color support * transparency for borders when on brand bg * Revert "transparency for borders when on brand bg" This reverts commit a8c4748. * sat improv * reduced max bdr value * enhanced border calc * removing duplicates * high contrast improvement * separate file for tokens to avoid duplication on .css files * brand center enabled by default * another pallete generation method + accessibility improvement * 4px rounded standard * revert to 0 based on community feedback * fix css to less * New utilities * event icon * fix delay + opacity * wip * wip * New utilities * media queries for wrap * responsive utilities * final * final * revert connector style @shinde-rahul * make preview and builder the same @shinde-rahul * other improvements for builder + preview @kuzmany * grunt compile-less after rebase * fix missing translation for jump itens * making campaign icons reusasble by @patrykgruszka * name below @kuzmany * fixing accessibility, colors, layout and everything based on slack conversation * covering more actions * Squashed commit of the following: commit 3ad8223 Merge: f79216d b228705 Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Jun 21 10:35:56 2024 -0300 Merge remote-tracking branch 'upstream/5.x' into ui-token-based-approach-for-interface-elements-and-colors commit f79216d Author: andersonjeccel <116097999+andersonjeccel@users.noreply.github.com> Date: Fri Jun 21 10:35:19 2024 -0300 semantic fixes commit b228705 Author: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Date: Tue Jun 18 17:20:10 2024 +0200 Make the search regular expression match both "&" and "&" for link replacement within an email body (#13858) commit 58c1903 Author: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Jun 18 11:37:28 2024 -0300 [UI] Increased icon size (#13825) * increased icon size * decrease by 1px commit 2331cf3 Author: John Linhart <admin@escope.cz> Date: Tue Jun 18 14:42:43 2024 +0200 Segment membership as a new filter for dynamic email content (#13528) * Merge pull request #1088 from mautic-inc/MAUT-4688 Maut 4688 - Use segment membership as a filter for dynamic content in email * Changes needed after rebase to M5 * Merge pull request #1407 from acquia/MAUT-5729 MAUT-5729 Dynamic Content Error - Segment Membership filter not showing correct content * Fixing STAN * CS fixes * Test fix * test fix part 2 * Adding back JS methods removed in a bad conflict resolution --------- Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> commit 3edfeec Author: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> Date: Tue Jun 18 09:34:10 2024 -0300 add js code to hide profile pic if missing (#13838) commit fadcf26 Author: putzwasser <26040044+putzwasser@users.noreply.github.com> Date: Tue Jun 18 12:56:34 2024 +0200 [UI] Replaces table action button `arrow-down` with `more-2` icon (#13841) * [UI] Replaces table action button `arrow-down` with `more-2` icon This replaces the icon for the action toggle button in tables (e.g. contact list table or segment list table) with a 3 dot icon. The previous arrow down icon indicates that an collapsed element would get unfolded/shown. This is not the case in these tables. The button shows more actions. In any UI that I know a 3 dot icon is used for that. The arrow down icon would be more suitable if it would show more details on click. Hence, this PR. * TASK: Reverts change for `page_actions.html.twig` Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> --------- Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> * colors for the creation panel * cs fix * test * cs fix * Revert "colors for the creation panel" This reverts commit c5782e6.
escopecz
added a commit
that referenced
this pull request
Jul 26, 2024
* Improve grammar for unhide (#13835) * Improve grammar for unhide * Fix test * fix: LeadBundle template errors (#13862) Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * [UI] fix CSS flexbox broken in campaign insert clone view (#13878) * [UI] Replaces table action button `arrow-down` with `more-2` icon (#13841) * [UI] Replaces table action button `arrow-down` with `more-2` icon This replaces the icon for the action toggle button in tables (e.g. contact list table or segment list table) with a 3 dot icon. The previous arrow down icon indicates that an collapsed element would get unfolded/shown. This is not the case in these tables. The button shows more actions. In any UI that I know a 3 dot icon is used for that. The arrow down icon would be more suitable if it would show more details on click. Hence, this PR. * TASK: Reverts change for `page_actions.html.twig` Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> --------- Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> * add js code to hide profile pic if missing (#13838) * Segment membership as a new filter for dynamic email content (#13528) * Merge pull request #1088 from mautic-inc/MAUT-4688 Maut 4688 - Use segment membership as a filter for dynamic content in email * Changes needed after rebase to M5 * Merge pull request #1407 from acquia/MAUT-5729 MAUT-5729 Dynamic Content Error - Segment Membership filter not showing correct content * Fixing STAN * CS fixes * Test fix * test fix part 2 * Adding back JS methods removed in a bad conflict resolution --------- Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> * [UI] Increased icon size (#13825) * increased icon size * decrease by 1px * Make the search regular expression match both "&" and "&" for link replacement within an email body (#13858) * Guide users to build optimized segments (#13860) * Merge pull request #2172 from acquia/MAUT-11343 MAUT-11343 : Guide users to build optimized segments * fix twig file issue * Apply suggestions from code review Co-authored-by: John Linhart <admin@escope.cz> * push suggested changes --------- Co-authored-by: John Linhart <admin@escope.cz> * fix CSS flexbox broken in campaign insert clone view * Revert "[UI] Replaces table action button `arrow-down` with `more-2` icon (#13841)" This reverts commit fadcf26. * Revert "Segment membership as a new filter for dynamic email content (#13528)" This reverts commit 71031b7. * Revert "[UI] Increased icon size (#13825)" This reverts commit c00df3c. * Revert "Make the search regular expression match both "&" and "&" for link replacement within an email body (#13858)" This reverts commit d3e6ceb. * Revert "Guide users to build optimized segments (#13860)" This reverts commit bdabc26. * Revert "add js code to hide profile pic if missing (#13838)" This reverts commit 76dd7d6. --------- Co-authored-by: putzwasser <26040044+putzwasser@users.noreply.github.com> Co-authored-by: John Linhart <admin@escope.cz> Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> Co-authored-by: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Co-authored-by: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> * DPMMA-1020 Fix search email with special characters in campaign action (#10306) * fix: [DPMMA-1020] fix getLookupChoiceListAction for search with special characters * fix: [DPMMA-1020] phpstan * fix: focus item published (#13944) * Update .gitpod.Dockerfile 5.1 branch (#13955) * fix [DPMMA-2661] mapped field form 5.1 (#13938) * fix: [DPMMA-2661] Correct form mapper Mautic 5 * feat: [DPMMA-2661] Correct CSFixer * FIX: Removes onConfigSave which invokes htmlspecialchars and escapes tracking script (#13859) This fixes #13355 This removes the HTML escaping logic in the onConfigSave method of `ConfigSubscriber`. This change prevents the UI from displaying escaped HTML in the custom tracking JS field after saving the form. Previously, the form erroneously escaped HTML entities. By removing this code, users will now see the original HTML as expected when they revisit the form. The main issue, however, was that re-saving meant saving escaped HTML which would break inserting the tracking HTML code. **Before** 1. Add custom HTML in `Configuration > Landing Page Settings > Analytics script (i.e. Google Analytics) ` 2. Save 3. Open this view again → see escaped HTML 4. Save again 5. Open a landing page and see escaped HTML tracking code injected. **After** 1. Add custom HTML in `Configuration > Landing Page Settings > Analytics script (i.e. Google Analytics) ` 2. Save 3. Open this view again → see unescaped HTML 4. Save again 5. Open a landing page and see correct HTML tracking code injected. * rename from tweet to tweets (#13967) * Fix: Create custom fields for lookup list. (#13946) * FIX: Makes `anniversary` date filter compatible with datetime (#13871) * FIX: Makes `anniversary` date filter compatible with datetime * TASK: Fix unit test * FIX: $expectedResult docstring --------- Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk> Co-authored-by: Frettyl <173093231+Frettyl@users.noreply.github.com> Co-authored-by: Anderson, from Dropsolid <116097999+andersonjeccel@users.noreply.github.com> Co-authored-by: putzwasser <26040044+putzwasser@users.noreply.github.com> Co-authored-by: Lukáš Drahý <lukas@drahy.net> Co-authored-by: Rohit Pavaskar <66303837+rohitp19@users.noreply.github.com> Co-authored-by: Miroslav Fedeleš <miroslav.fedeles@gmail.com> Co-authored-by: Saurabh Gupta <48244990+dadarya0@users.noreply.github.com> Co-authored-by: Patryk Gruszka <patryk.gruszka@comarch.pl> Co-authored-by: Tomasz Kowalczyk <39382654+tomekkowalczyk@users.noreply.github.com> Co-authored-by: Martin Vooremäe <martin.vooremae@gmail.com> Co-authored-by: Abhisek Mazumdar <abhisekmazumdar@users.noreply.github.com>
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.
Description
Make the search regular expression match both "&" and "&" for link replacement within an email body
This PR fixes the issue with email URLs containing
&. If there is a link likehttps://www.google.com?foo=1&bar=2within an email, the link is not replaced with a trackable link. See the screen recording below.Screen.Recording.2024-06-18.at.13.06.38.mov
📋 Steps to test this PR:
https://mautic-community.ddev.site/r/c6d3df7e8cef5f58e9046abcd?ct=YTo1OntzOjY6InNvdXJjZSI7YTowOnt9czo1OiJlbWFpb...) as you can see in the "After" screenshot.