Avoid possible error subtable already exists but not loaded (#15779)

1 files changed, 5 insertions, 1 deletions

diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php
index fdc69a5f54..dfa04da14c 100644
--- a/core/Archive/DataTableFactory.php
+++ b/core/Archive/DataTableFactory.php
@@ -404,13 +404,17 @@ class DataTableFactory
             foreach ($dataTable->getRowsWithoutSummaryRow() as $row) {
                 $row->removeSubtable();
             }
+            $summaryRow = $dataTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
+            if ($summaryRow) {
+                $summaryRow->removeSubtable();
+            }
 
             return;
         }
 
         $dataName = reset($this->dataNames);
 
-        foreach ($dataTable->getRowsWithoutSummaryRow() as $row) {
+        foreach ($dataTable->getRows() as $row) {
             $sid = $row->getIdSubDataTable();
             if ($sid === null) {
                 continue;