friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/7169/head
Michael 2019-05-19 17:03:50 +00:00
parent 14d4132ad0 37422dfa34
commit 35c7a61620
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Util/XML.php
View File

@ -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;
}