Port the escaped Matomo domain to 6.x, #AS-685 - #645
Merged
Conversation
(cherry picked from commit dedee7b)
AltamashShaikh
approved these changes
Aug 20, 2026
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
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
Forward-ports the AS-685 fix, which escapes the Matomo domain before it is appended to the import command. It landed on
5.x-devon 19 August and has no equivalent on the 6.x line, so Matomo 6 would have shipped without it.Cherry-picked with
-x, so it keeps a reference to the original commit. Two lines, one inImporter.phpand one inImporterGA4.php.Based on
6.x-devrather thanprepare6x: unlike the dependency regeneration in #644, this does not depend on the PHP floor that #639 introduces, and #639 does not touch either file, so it can be reviewed and merged on its own rather than waiting behind the migration.No version bump or changelog entry, matching the original commit — and the
6.0.0entry this would otherwise belong under does not exist on6.x-devyet, since it arrives with #639.Issue No
AS-685, on the 6.x line.
Steps to Replicate the Issue
Importer.phpandImporterGA4.phpbetween5.x-devand6.x-dev.5.x-devescapes it.Checklist