Revert PR 7158 since it breaks umlauts

diff --git a/src/Util/XML.php b/src/Util/XML.php
index 3159fb95e9d1add80e8e7f3223b150587af6fa4c..476ecb4b00e7f964325e647472afd8b6bcf345c6 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -471,7 +471,7 @@ class XML
         */
        public static function escape($str)
        {
-               $buffer = htmlentities($str, ENT_QUOTES, 'UTF-8');
+               $buffer = htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
                $buffer = trim($buffer);
 
                return $buffer;
@@ -485,7 +485,7 @@ class XML
         */
        public static function unescape($s)
        {
-               $ret = html_entity_decode($s, ENT_QUOTES);
+               $ret = htmlspecialchars_decode($s, ENT_QUOTES);
                return $ret;
        }