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:
authorStefan Giehl <stefan@matomo.org>2022-06-07 05:27:00 +0300
committerGitHub <noreply@github.com>2022-06-07 05:27:00 +0300
commit42870c6a4e0c6e004ab0892c452599ae323e6e5a (patch)
tree83586193613a5af4795e464a51f2b6352489d052
parenta81d55323a9c9a80694609ab131c9ce46f956f63 (diff)
Improve memory usage of CSV exporter (#19315)
-rw-r--r--core/DataTable/Renderer/Csv.php11
1 files changed, 1 insertions, 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));