mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
fix json_php_unserialize to return false for not serialized content, as unserialize does and in contray to json_decode which returns null in that case
--> fixes SiteMgr no longer shows html blocks containing unserialized content
This commit is contained in:
parent
888deaaaa4
commit
662d810d2d
@ -315,7 +315,7 @@ if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE_
|
||||
*
|
||||
* @param string $str string with serialized array
|
||||
* @param boolean $allow_not_serialized =false true: return $str as is, if it is no serialized array
|
||||
* @return array|str|false
|
||||
* @return array|str|false false if content can not be unserialized (not null like json_decode!)
|
||||
*/
|
||||
function json_php_unserialize($str, $allow_not_serialized=false)
|
||||
{
|
||||
@ -324,9 +324,14 @@ function json_php_unserialize($str, $allow_not_serialized=false)
|
||||
{
|
||||
return $arr;
|
||||
}
|
||||
if (!$allow_not_serialized || $str[0] == '[' || $str[0] == '{' || $str[0] == '"' || $str === 'null' || ($val = json_decode($str)) !== null)
|
||||
if (!$allow_not_serialized || $str[0] == '[' || $str[0] == '{' || $str[0] == '"' || $str === 'null' || ($val = json_decode($str, true)) !== null)
|
||||
{
|
||||
return isset($val) ? $val : json_decode($str, true);
|
||||
// json_decode return null, if it cant decode the content
|
||||
if (isset($val) || ($val = json_decode($str, true)) !== null || $str === 'null')
|
||||
{
|
||||
return $val;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return $str;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user