nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7166 from annando/revert-7158

Browse source 
Revert PR 7158 since it breaks umlauts
This commit is contained in:
Hypolite Petovan 2019-05-19 07:37:01 -04:00 committed by GitHub
commit 37422dfa34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
}