From 42870c6a4e0c6e004ab0892c452599ae323e6e5a Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Tue, 7 Jun 2022 04:27:00 +0200 Subject: Improve memory usage of CSV exporter (#19315) --- core/DataTable/Renderer/Csv.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php index b67150d2fd..b5aad2525e 100644 --- a/core/DataTable/Renderer/Csv.php +++ b/core/DataTable/Renderer/Csv.php @@ -192,15 +192,6 @@ class Csv extends Renderer $csv = $this->makeArrayFromDataTable($table, $allColumns); - // now we make sure that all the rows in the CSV array have all the columns - foreach ($csv as &$row) { - foreach ($allColumns as $columnName => $true) { - if (!isset($row[$columnName])) { - $row[$columnName] = ''; - } - } - } - $str = $this->buildCsvString($allColumns, $csv); return $str; } @@ -390,7 +381,7 @@ class Csv extends Renderer foreach ($csv as $theRow) { $rowStr = ''; foreach ($allColumns as $columnName => $true) { - $rowStr .= $this->formatValue($theRow[$columnName]) . $this->separator; + $rowStr .= $this->formatValue($theRow[$columnName] ?? '') . $this->separator; } // remove the last separator $rowStr = substr_replace($rowStr, "", -strlen($this->separator)); -- cgit v1.2.3