mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-19 07:25:30 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Petr Škoda 2012-11-08 08:49:50 +01:00
parent 20751863e3
commit e9a3070676
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/textlib.class.php
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 === '') {