Merge branch 'MDL-71637-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE
This commit is contained in:
@@ -104,7 +104,7 @@ function min_fix_utf8($value) {
|
||||
if ($buggyiconv) {
|
||||
if (function_exists('mb_convert_encoding')) {
|
||||
$subst = mb_substitute_character();
|
||||
mb_substitute_character('');
|
||||
mb_substitute_character('none');
|
||||
$result = mb_convert_encoding($value, 'utf-8', 'utf-8');
|
||||
mb_substitute_character($subst);
|
||||
|
||||
|
||||
+1
-1
@@ -1284,7 +1284,7 @@ function fix_utf8($value) {
|
||||
if ($buggyiconv) {
|
||||
if (function_exists('mb_convert_encoding')) {
|
||||
$subst = mb_substitute_character();
|
||||
mb_substitute_character('');
|
||||
mb_substitute_character('none');
|
||||
$result = mb_convert_encoding($value, 'utf-8', 'utf-8');
|
||||
mb_substitute_character($subst);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user