diff options
| author | Peter Zhang <peter@innocraft.com> | 2022-01-07 15:20:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 15:20:44 +0300 |
| commit | 88797d70be882db2a56cd876fed1063fc1cd929c (patch) | |
| tree | c24fc5be9313780e04b6323079aaceae4293a10a /core | |
| parent | 57cd4a4a8b078a414fb9304eb8bfadd3ff40bef5 (diff) | |
dependent archive never run (#18403)
* Update ArchiveProcessor.php
set plugin not include UserCountry
* Update ArchiveProcessor.php
update processer
* Update ArchiveProcessor.php
remove hardcode plugin name
* add tests
add tests
* fix test
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/ArchiveProcessor.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php index 09bfeb2428..2fa72d2dbb 100644 --- a/core/ArchiveProcessor.php +++ b/core/ArchiveProcessor.php @@ -679,8 +679,9 @@ class ArchiveProcessor // vs here we would use // userId!@%40matomo.org;userId!=hello%40matomo.org;visitorType==new // thus these would result in different segment hashes and therefore the reports would either show 0 or archive the data twice - $newSegment = Segment::combine($params->getSegment()->getOriginalString(), SegmentExpression::AND_DELIMITER, $segment); - if ($newSegment === $segment && $params->getRequestedPlugin() === $plugin) { // being processed now + $originSegmentString = $params->getSegment()->getOriginalString(); + $newSegment = Segment::combine($originSegmentString, SegmentExpression::AND_DELIMITER, $segment); + if (!empty($originSegmentString) && $newSegment === $segment && $params->getRequestedPlugin() === $plugin) { // being processed now return; } |