Merge remote-tracking branch 'upstream/develop' into send-suggest
This commit is contained in:
commit
35c7a61620
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue