diff options
Diffstat (limited to 'lib/gettext/gettext.inc')
-rw-r--r-- | lib/gettext/gettext.inc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/gettext/gettext.inc b/lib/gettext/gettext.inc index 00b966692..c9f7dc016 100644 --- a/lib/gettext/gettext.inc +++ b/lib/gettext/gettext.inc @@ -174,14 +174,13 @@ function _get_codeset($domain=null) { * Convert the given string to the encoding set by bind_textdomain_codeset. */ function _encode($text) { + $target_encoding = _get_codeset(); + if (function_exists("mb_detect_encoding")) { $source_encoding = mb_detect_encoding($text); - $target_encoding = _get_codeset(); - if ($source_encoding != $target_encoding) { - return mb_convert_encoding($text, $target_encoding, $source_encoding); - } - else { - return $text; - } + if ($source_encoding != $target_encoding) + $text = mb_convert_encoding($text, $target_encoding, $source_encoding); + } + return $text; } |