mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Fix wrong parameters to serendipity_entity_decode()

Browse Source
This commit is contained in:
Garvin Hicking 2014-12-23 11:33:41 +01:00
parent 36cde3030a
commit d35b4d127d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/NEWS
View File

@ -6,6 +6,8 @@ Version 2.0-rc2 (December 23rd, 2014)
* Fixes escaping of comments in the new backend pane to prevent
XSS. Thanks to Steffen Röemann for reporting!
* Fix wrong parameter count in serendipity_entity_decode
Version 2.0-rc1 (includes beta4/5/6) (December 19th, 2014)
------------------------------------------------------------------------

4
include/compat.inc.php
View File

@ -450,7 +450,7 @@ function serendipity_entities($string, $flags = null, $encoding = LANG_CHARSET,
/**
* serendipity_specialchars
*/
function serendipity_entity_decode($string, $flags = null, $encoding = LANG_CHARSET, $double_encode = true) {
function serendipity_entity_decode($string, $flags = null, $encoding = LANG_CHARSET) {
if ($flags == null) {
# NOTE: ENT_SUBSTITUTE does not exist for this function, and the documentation does not specify that it will
# ever echo empty strings on charset errors
@ -465,7 +465,7 @@ function serendipity_entity_decode($string, $flags = null, $encoding = LANG_CHAR
if ($encoding == 'LANG_CHARSET') {
$encoding = 'UTF-8';
}
return html_entity_decode($string, $flags, $encoding, $double_encode);
return html_entity_decode($string, $flags, $encoding);
}
/* vim: set sts=4 ts=4 expandtab : */