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

Merge pull request #7158 from MrPetovan/bug/7150-unescape-xml-entities

Browse source 
Replace htmlspecialchars_decode with html_entity_decode in XML::unescape
This commit is contained in:
Philipp 2019-05-18 19:53:25 +02:00 committed by GitHub
parent cff4577cc5 8fb9722cdc
commit 67a4a80076
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Util/XML.php
View file

@ -4,8 +4,8 @@
*/
namespace Friendica\Util;
use Friendica\Core\Logger;
use DOMXPath;
use Friendica\Core\Logger;
use Friendica\Core\System;
use SimpleXMLElement;
@ -465,12 +465,13 @@ class XML
/**
* escape text ($str) for XML transport
*
* @param string $str
* @return string Escaped text.
*/
public static function escape($str)
{
$buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
$buffer = htmlentities($str, ENT_QUOTES, 'UTF-8');
$buffer = trim($buffer);
return $buffer;
@ -478,27 +479,30 @@ class XML
/**
* undo an escape
*
* @param string $s xml escaped text
* @return string unescaped text
*/
public static function unescape($s)
{
$ret = htmlspecialchars_decode($s, ENT_QUOTES);
$ret = html_entity_decode($s, ENT_QUOTES);
return $ret;
}
/**
* apply escape() to all values of array $val, recursively
*
* @param array $val
* @return array
* @return array|string
*/
public static function arrayEscape($val)
{
if (is_bool($val)) {
return $val?"true":"false";
return $val ? 'true' : 'false';
} elseif (is_array($val)) {
return array_map('XML::arrayEscape', $val);
}
return self::escape((string) $val);
}
}