Move UTF-8 cleanup into its own method

1 files changed, 1 insertions, 11 deletions

diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index 02ec811a..abc78070 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -424,17 +424,7 @@ function xml_from_array($array, $callback = false, $type = '') {
                 "\n<root>\n" . $string . "</root>\n";
         }
 
-        // Remove invalid XML characters.
-        // See http://www.w3.org/TR/2006/REC-xml-20060816/#charsets
-        $clean = preg_replace('/[^\x{9}\x{a}\x{d}\x{20}-\x{d7ff}\x{e000}-\x{fffd}\x{10000}-\x{10ffff}]|[\x{7f}-\x{84}\x{86}-\x{9f}\x{fdd0}-\x{fddf}\x{1fffe}-\x{1ffff}\x{2fffe}-\x{2ffff}\x{3fffe}-\x{3ffff}\x{4fffe}-\x{4ffff}\x{5fffe}-\x{5ffff}\x{6fffe}-\x{6ffff}\x{7fffe}-\x{7ffff}\x{8fffe}-\x{8ffff}\x{9fffe}-\x{9ffff}\x{afffe}-\x{affff}\x{bfffe}-\x{bffff}\x{cfffe}-\x{cffff}\x{dfffe}-\x{dffff}\x{efffe}-\x{effff}\x{ffffe}-\x{fffff}\x{10fffe}-\x{10ffff}]/u', '', $string);
-
-        if ($clean) {
-            return $clean;
-        }
-        else {
-            debug_event('xml_from_array', 'Charset cleanup failed, generated XML may be invalid', 1);
-            return $string;
-        }
+        return UI::clean_utf8($string);
     break;
     }
 } // xml_from_array