Handle any level of nested DataTables in ArchiveProcessor::aggregateDataTableRecord.

1 files changed, 4 insertions, 3 deletions

diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index e490d12dcb..757e93eba4 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -338,9 +338,10 @@ class ArchiveProcessor
 
         if ($dataTable instanceof Map) {
             // see http://dev.piwik.org/trac/ticket/4377
-            foreach ($dataTable->getDataTables() as $table) {
-                $this->renameColumnsAfterAggregation($table, $columnsToRenameAfterAggregation);
-            }
+            $self = $this;
+            $dataTable->filter(function ($table) use ($self, $columnsToRenameAfterAggregation) {
+                $self->renameColumnsAfterAggregation($table, $columnsToRenameAfterAggregation);
+            });
         }
 
         $dataTable = $this->getAggregatedDataTableMap($dataTable, $columnsAggregationOperation);