Merge commit from fork

This commit is contained in:
Roman Kelesidis 2024-07-13 19:26:57 +07:00 committed by GitHub
commit ed37e6e522
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions

View file

@ -40,8 +40,6 @@ function delete_avatar($user_id, $avatar_ext_id)
function get_tracks($type)
{
static $pattern = '#^a:\d+:{[i:;\d]+}$#';
switch ($type) {
case 'topic':
$c_name = COOKIE_TOPIC;
@ -55,7 +53,7 @@ function get_tracks($type)
default:
trigger_error(__FUNCTION__ . ": invalid type '$type'", E_USER_ERROR);
}
$tracks = !empty($_COOKIE[$c_name]) ? @unserialize($_COOKIE[$c_name]) : false;
$tracks = !empty($_COOKIE[$c_name]) ? json_decode($_COOKIE[$c_name], true) : false;
return $tracks ?: [];
}
@ -113,7 +111,7 @@ function set_tracks($cookie_name, &$tracking_ary, $tracks = null, $val = TIMENOW
}
if (array_diff($tracking_ary, $prev_tracking_ary)) {
bb_setcookie($cookie_name, serialize($tracking_ary));
bb_setcookie($cookie_name, json_encode($tracking_ary));
}
}