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

Prepare release 2.1.1

Browse Source
This commit is contained in:
Garvin Hicking 2017-04-09 09:15:55 +02:00
parent 9365836307
commit 8fee805ca1
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -1,7 +1,9 @@
Version 2.1.1-beta1 ()
Version 2.1.1 (April 9th, 2017)
------------------------------------------------------------------------
* Fixed a regression issue where configuration variables could not
properly be stored when they were set to false.
Version 2.1.0 (April 8th, 2017)
------------------------------------------------------------------------

4
docs/RELEASE
View File

@ -1,2 +1,2 @@
stable:2.1.0
beta:2.1.0
stable:2.1.1
beta:2.1.1

17
include/compat.inc.php
View File

@ -518,6 +518,9 @@ if (function_exists('date_default_timezone_get')) {
* native encoded strings containing umlauts. This wrapper should to be used in the core until PHP 5.6 fixes the bug.
*/
function serendipity_specialchars($string, $flags = null, $encoding = LANG_CHARSET, $double_encode = true) {
if (is_array($string)) {
return '';
}
if ($flags == null) {
if (defined('ENT_HTML401')) {
// Added with PHP 5.4.x
@ -534,13 +537,17 @@ function serendipity_specialchars($string, $flags = null, $encoding = LANG_CHARS
$encoding = 'UTF-8';
}
return htmlspecialchars($string, $flags, $encoding, $double_encode);
return htmlspecialchars((string)$string, $flags, $encoding, $double_encode);
}
/**
* see serendipity_specialchars
*/
function serendipity_entities($string, $flags = null, $encoding = LANG_CHARSET, $double_encode = true) {
if (is_array($string)) {
return '';
}
if ($flags == null) {
if (defined('ENT_HTML401')) {
// Added with PHP 5.4.x
@ -553,13 +560,17 @@ function serendipity_entities($string, $flags = null, $encoding = LANG_CHARSET,
if ($encoding == 'LANG_CHARSET') {
$encoding = 'UTF-8';
}
return htmlentities($string, $flags, $encoding, $double_encode);
return htmlentities((string)$string, $flags, $encoding, $double_encode);
}
/**
* serendipity_specialchars
*/
function serendipity_entity_decode($string, $flags = null, $encoding = LANG_CHARSET) {
if (is_array($string)) {
return '';
}
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
@ -574,7 +585,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);
return html_entity_decode((string)$string, $flags, $encoding);
}
/* vim: set sts=4 ts=4 expandtab : */