epic-ts

[kivitendo-erp.git] / SL / Iconv.pm

diff --git a/SL/Iconv.pm b/SL/Iconv.pm
index d6ea0cb..aba271a 100644 (file)
--- a/SL/Iconv.pm
+++ b/SL/Iconv.pm
@@ -33,11 +33,14 @@ sub convert {
 
   my ($from_charset, $to_charset, $text) = @_;
 
-  $from_charset ||= Common::DEFAULT_CHARSET;
-  $to_charset   ||= Common::DEFAULT_CHARSET;
+  $from_charset ||= 'UTF-8';
+  $to_charset   ||= 'UTF-8';
 
   my $converter = _get_converter($from_charset, $to_charset);
-  return $converter->convert($text);
+  $text         = $converter->convert($text);
+  $text         = decode("utf-8-strict", $text) if ($to_charset =~ m/^utf-?8$/i) && !Encode::is_utf8($text);
+
+  return $text;
 }
 
 sub _convert {