From 5bf48252b5ae9961612706a148e5d93091f4e8de Mon Sep 17 00:00:00 2001
From: Peter Dias <peter@moodle.com>
Date: Wed, 26 May 2021 13:51:46 +0800
Subject: [PATCH] MDL-71637 core: Set default for mb_substitute_character

---
 lib/configonlylib.php | 2 +-
 lib/moodlelib.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/configonlylib.php b/lib/configonlylib.php
index 670d69b8ede..df542688628 100644
--- a/lib/configonlylib.php
+++ b/lib/configonlylib.php
@@ -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);
 
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index bfbfaaedea4..c15114b4eb7 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -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);