Merge remote-tracking branch 'upstream/develop' into send-suggest

pull/7169/head
Michael 2019-05-19 17:03:50 +00:00
commit 35c7a61620
1 changed files with 2 additions and 2 deletions

View File

@ -471,7 +471,7 @@ class XML
*/ */
public static function escape($str) public static function escape($str)
{ {
$buffer = htmlentities($str, ENT_QUOTES, 'UTF-8'); $buffer = htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
$buffer = trim($buffer); $buffer = trim($buffer);
return $buffer; return $buffer;
@ -485,7 +485,7 @@ class XML
*/ */
public static function unescape($s) public static function unescape($s)
{ {
$ret = html_entity_decode($s, ENT_QUOTES); $ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret; return $ret;
} }