Merge branch 'feature/92516' into v2

etna-alternance · Jun 1, 2018 · ea8aa9a · ea8aa9a
2 parents a75866d + 41af1d7
commit ea8aa9a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/CsvUtils.php b/src/CsvUtils.php
@@ -20,7 +20,7 @@ public static function getTokenFromArray($array, $prefix = '')
             if (is_array($value)) {
                 $tokens = array_merge($tokens, self::getTokenFromArray($value, $sub_prefix));
             } else {
-                $tokens[$sub_prefix] = utf8_decode($value);
+                $tokens[$sub_prefix] = mb_convert_encoding($value, 'Windows-1252', 'UTF-8');
             }
         }
         return $tokens;