Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2020-06-01 23:07:30 +0300
committerGitHub <noreply@github.com>2020-06-01 23:07:30 +0300
commitc673716e4d2fa84c2ebcf7e7afa3b9566d33262b (patch)
tree5d6b95b50aed1d5a3a211d5b2f95976b2b98258c
parent4317d30d822a2b496649a74721debda87a011329 (diff)
Fix min archive time not respected (#15997)
-rw-r--r--core/DataAccess/ArchiveSelector.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index daaeb7b2a6..b9d8735713 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -90,10 +90,14 @@ class ArchiveSelector
return [false, $visits, $visitsConverted, true];
}
+ if (!empty($minDatetimeArchiveProcessedUTC) && !is_object($minDatetimeArchiveProcessedUTC)) {
+ $minDatetimeArchiveProcessedUTC = Date::factory($minDatetimeArchiveProcessedUTC);
+ }
+
// the archive is too old
if ($minDatetimeArchiveProcessedUTC
&& isset($result['idarchive'])
- && Date::factory($result['ts_archived'])->isEarlier(Date::factory($minDatetimeArchiveProcessedUTC))
+ && Date::factory($result['ts_archived'])->isEarlier($minDatetimeArchiveProcessedUTC)
) {
return [false, $visits, $visitsConverted, true];
}