Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inc/backend.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public static function toUTF8($string)
{

if (!self::is_utf8($string)) {
return utf8_encode($string);
return Toolbox::encodeInUtf8($string);
}
return $string;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/backendcsv.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static function parseLine($fic, $data, $encoding = 1)
//If file is ISO8859-1 : encode the data in utf8
case PluginDatainjectionBackend::ENCODING_ISO8859_1:
if (!Toolbox::seems_utf8($tmp)) {
$csv[0][] = utf8_encode($tmp);
$csv[0][] = Toolbox::encodeInUtf8($tmp);
} else {
$csv[0][] = $tmp;
}
Expand Down
Loading