Skip to content
Snippets Groups Projects
Commit 2acc9ef1 authored by Quentin Ribac's avatar Quentin Ribac
Browse files

FEAT #18096 TIME 0:05 put back utf8_decode() on exports

parent dcc158c2
No related branches found
No related tags found
No related merge requests found
...@@ -708,12 +708,13 @@ class EntityController ...@@ -708,12 +708,13 @@ class EntityController
} }
} }
fputcsv($file, array_column($fields, 'label'), $delimiter); $csvHead = array_map(utf8_decode, array_column($fields, 'label'));
fputcsv($file, $csvHead, $delimiter);
foreach ($entities as $entity) { foreach ($entities as $entity) {
$entityValues = []; $entityValues = [];
foreach ($fields as $field) { foreach ($fields as $field) {
$entityValues[] = $entity[$allowedFields[$field['value']]]; $entityValues[] = utf8_decode($entity[$allowedFields[$field['value']]]);
} }
fputcsv($file, $entityValues, $delimiter); fputcsv($file, $entityValues, $delimiter);
} }
......
...@@ -1761,13 +1761,13 @@ class UserController ...@@ -1761,13 +1761,13 @@ class UserController
$file = fopen('php://temp', 'w'); $file = fopen('php://temp', 'w');
$csvHead = array_column($fields, 'label'); $csvHead = array_map(utf8_decode, array_column($fields, 'label'));
fputcsv($file, $csvHead, $delimiter); fputcsv($file, $csvHead, $delimiter);
foreach ($users as $user) { foreach ($users as $user) {
$csvContent = []; $csvContent = [];
foreach ($fields as $field) { foreach ($fields as $field) {
$csvContent[] = $user[$allowedFields[$field['value']]] ?? ''; $csvContent[] = utf8_decode($user[$allowedFields[$field['value']]] ?? '');
} }
fputcsv($file, $csvContent, $delimiter); fputcsv($file, $csvContent, $delimiter);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment