From 51b7297b7ee6bdf9819fb16f3c1eb93da1e077e2 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Mon, 23 Apr 2012 11:43:56 +0200
Subject: [PATCH] MDL-32586 silence buggy glibc when fixing utf-8 strings

---
 lib/moodlelib.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 90c1677f1ce..8b3cb574b7a 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1127,7 +1127,16 @@ function fix_utf8($value) {
             // shortcut
             return $value;
         }
-        return iconv('UTF-8', 'UTF-8//IGNORE', $value);
+        // lower error reporting because glibc throws bogus notices
+        $olderror = error_reporting();
+        if ($olderror & E_NOTICE) {
+            error_reporting($olderror ^ E_NOTICE);
+        }
+        $result = iconv('UTF-8', 'UTF-8//IGNORE', $value);
+        if ($olderror & E_NOTICE) {
+            error_reporting($olderror);
+        }
+        return $result;
 
     } else if (is_array($value)) {
         foreach ($value as $k=>$v) {