Merge remote-tracking branch 'origin/AC-7567-V1' into AC-6762-v1

glo82145 · glo82145 · commit 81ccb78de712 · 2023-01-09T19:21:02.000+05:30
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -1067,10 +1067,11 @@ public function getCsv()
             $data = [];
             foreach ($this->getColumns() as $column) {
                 if (!$column->getIsSystem()) {
+                    $exportField = (string)$column->getRowFieldExport($item);
                     $data[] = '"' . str_replace(
                         ['"', '\\'],
                         ['""', '\\\\'],
-                        $column->getRowFieldExport($item) ?: ''
+                        $exportField ?: ''
                     ) . '"';
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1067,10 +1067,11 @@ public function getCsv()`
`1067`	`1067`	`$data = [];`
`1068`	`1068`	`foreach ($this->getColumns() as $column) {`
`1069`	`1069`	`if (!$column->getIsSystem()) {`
	`1070`	`+ $exportField = (string)$column->getRowFieldExport($item);`
`1070`	`1071`	`$data[] = '"' . str_replace(`
`1071`	`1072`	`['"', '\\'],`
`1072`	`1073`	`['""', '\\\\'],`
`1073`		`- $column->getRowFieldExport($item) ?: ''`
	`1074`	`+ $exportField ?: ''`
`1074`	`1075`	`) . '"';`
`1075`	`1076`	`}`
`1076`	`1077`	`}`