From e3956c28762877e041671427b59d24c927b08521 Mon Sep 17 00:00:00 2001 From: Damien Regad Date: Mon, 18 Apr 2016 11:24:52 +0000 Subject: [PATCH] Use ':' as separator in collapse_settings cookie Previously we were using a comma, which is not a valid character in a cookie (per RFC6265 section 4.1.1 [1]). Fixes #20822 [1] http://tools.ietf.org/html/rfc6265#section-4.2.1 [^] --- core/collapse_api.php | 2 +- js/common.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/collapse_api.php b/core/collapse_api.php index 86dd91c78c..7747cc283c 100644 --- a/core/collapse_api.php +++ b/core/collapse_api.php @@ -209,7 +209,7 @@ function collapse_cache_token() { $t_data = explode( '|', $t_cookie ); foreach( $t_data as $t_pair ) { - $t_pair = explode( ',', $t_pair ); + $t_pair = explode( ':', $t_pair ); if( false !== $t_pair && count( $t_pair ) == 2 ) { $g_collapse_cache_token[$t_pair[0]] = ( true == $t_pair[1] ); diff --git a/js/common.js b/js/common.js index 1af6cb3546..78c89ca93f 100644 --- a/js/common.js +++ b/js/common.js @@ -389,9 +389,9 @@ function ToggleDiv( p_div ) { } if ( t_open_display == "none" ) { - t_cookie = t_cookie + "|" + p_div + ",1"; + t_cookie = t_cookie + "|" + p_div + ":1"; } else { - t_cookie = t_cookie + "|" + p_div + ",0"; + t_cookie = t_cookie + "|" + p_div + ":0"; } SetCookie( "collapse_settings", t_cookie );