MDL-36245 try to workaround buggy iconv() when converting text from utf-8 to utf-8

This commit is contained in:
Petr Škoda
2012-12-15 11:51:21 +01:00
parent 7d2c5cd0a0
commit f16a143872
+5 -2
View File
@@ -161,8 +161,7 @@ class textlib {
/**
* Converts the text between different encodings. It uses iconv extension with //TRANSLIT parameter,
* falls back to typo3.
* Returns false if fails.
* falls back to typo3. If both source and target are utf-8 it tries to fix invalid characters only.
*
* @param string $text
* @param string $fromCS source encoding
@@ -179,6 +178,10 @@ class textlib {
return '';
}
if ($toCS === 'utf-8' and $fromCS === 'utf-8') {
return fix_utf8($text);
}
$result = iconv($fromCS, $toCS.'//TRANSLIT', $text);
if ($result === false or $result === '') {