Merge branch '4.x-dev' into 5.x-dev

2 files changed, 7 insertions, 6 deletions

diff --git a/core/Archive/ArchiveInvalidator/InvalidationResult.php b/core/Archive/ArchiveInvalidator/InvalidationResult.php
index ca7aae5fda..2b30e1b058 100644
--- a/core/Archive/ArchiveInvalidator/InvalidationResult.php
+++ b/core/Archive/ArchiveInvalidator/InvalidationResult.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Matomo - free/libre analytics platform
  *
@@ -21,14 +22,14 @@ class InvalidationResult
      *
      * @var array
      */
-    public $warningDates = array();
+    public $warningDates = [];
 
     /**
      * Dates that were successfully invalidated.
      *
      * @var array
      */
-    public $processedDates = array();
+    public $processedDates = [];
 
     /**
      * The day of the oldest log entry.
@@ -40,9 +41,9 @@ class InvalidationResult
     /**
      * @return string[]
      */
-    public function makeOutputLogs()
+    public function makeOutputLogs(): array
     {
-        $output = array();
+        $output = [];
         if ($this->warningDates) {
             $output[] = 'Warning: the following Dates have not been invalidated, because they are earlier than your Log Deletion limit: ' .
                 implode(", ", $this->warningDates) .
@@ -53,4 +54,4 @@ class InvalidationResult
         $output[] = "Success. The following dates were invalidated successfully: " . implode(", ", $this->processedDates);
         return $output;
     }
-}
\ No newline at end of file
+}
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index 61479f39d0..883dcf763d 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -321,7 +321,7 @@ class LogAggregator
             return;
         }
 
-        $insertIntoStatement = 'INSERT INTO ' . $table . ' (idvisit) ' . $segmentSelectSql;
+        $insertIntoStatement = 'INSERT IGNORE INTO ' . $table . ' (idvisit) ' . $segmentSelectSql;
         $readerDb->query($insertIntoStatement, $segmentSelectBind);
 
         $transactionLevel->restorePreviousStatus();