Skip to content

Prevent automated linking in emails #23248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 28, 2025
Merged

Prevent automated linking in emails #23248

merged 4 commits into from
Apr 28, 2025

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Apr 24, 2025

Description:

Review

@sgiehl sgiehl marked this pull request as ready for review April 24, 2025 13:40
@sgiehl sgiehl added this to the 5.4.0 milestone Apr 24, 2025
@sgiehl sgiehl added c: Security For issues that make Matomo more secure. Please report issues through HackerOne and not in Github. c: Usability For issues that let users achieve a defined goal more effectively or efficiently. labels Apr 24, 2025
@sgiehl sgiehl requested a review from a team April 24, 2025 14:16
@caddoo caddoo merged commit 993d6c3 into 5.x-dev Apr 28, 2025
23 of 27 checks passed
@caddoo caddoo deleted the dev-18552 branch April 28, 2025 08:07
michalkleiner pushed a commit that referenced this pull request Apr 30, 2025
* Prevent automated linking in emails

* prevent linking on some more elements

* add some tests

---------

Co-authored-by: caddoo <1169490+caddoo@users.noreply.github.com>
michalkleiner pushed a commit that referenced this pull request Apr 30, 2025
* Prevent automated linking in emails

* prevent linking on some more elements

* add some tests

---------

Co-authored-by: caddoo <1169490+caddoo@users.noreply.github.com>
caddoo added a commit that referenced this pull request May 1, 2025
* Prevent automated linking in emails

* prevent linking on some more elements

* add some tests

---------

Co-authored-by: caddoo <1169490+caddoo@users.noreply.github.com>
caddoo added a commit that referenced this pull request May 2, 2025
* Cherry pick ubuntu-24.04 update excl. submodule update (#23097)

* Update expected test results

* Ensure login username is provided as string value (#23117)

* Prevent automated linking in emails (#23248)

* Prevent automated linking in emails

* prevent linking on some more elements

* add some tests

---------

Co-authored-by: caddoo <1169490+caddoo@users.noreply.github.com>

* Improve handling of prefixUrl parameter in API.listAllMethods (#23247)

* Fix escaping in realtime report (#23245)

* Ensure all translations required for password confirmation are always loaded (#23176)

* Suppress errors when trying to access javaEnabled property (#23161)

Co-authored-by: caddoo <matthew.caddoo@gmail.com>

* Ensure to discard campaign names with invalid type (#23229)

* Prevent concurrency when removing sites (#23230)

* Prevent warning when no email is set for current user (#23228)

* Improve region name fetching (#23235)

* Unset actionsByVisitId after consumption (#23234)

* Use https URLs (#23072)

* Use https URLs

* Build vue files

* use matomo.org instead of piwik.org in some links

* updates expected UI test file

---------

Co-authored-by: innocraft-automation <innocraft-automation@users.noreply.github.com>

* Update screenshot

* Tweak regex for host checks

---------

Co-authored-by: Marc Neudert <marc@innocraft.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Co-authored-by: caddoo <1169490+caddoo@users.noreply.github.com>
Co-authored-by: caddoo <matthew.caddoo@gmail.com>
Co-authored-by: innocraft-automation <innocraft-automation@users.noreply.github.com>
private function addFilterPreventLinking()
{
$preventLinking = new TwigFilter('preventLinking', function ($string) {
while (preg_match('/\w+\.\w+/i', $string, $matches)) {
Copy link

@rubinlinux rubinlinux Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand why this weird while loop. Isn't this equivalent:
$string = preg_replace('/(\w+)\.(\w+)/i', '$1.<!-- -->$2', $string);

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: Security For issues that make Matomo more secure. Please report issues through HackerOne and not in Github. c: Usability For issues that let users achieve a defined goal more effectively or efficiently.
Development

Successfully merging this pull request may close these issues.

3 participants