diff options
Diffstat (limited to 'plugins/jetpack/modules/sso.php')
| -rw-r--r-- | plugins/jetpack/modules/sso.php | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/plugins/jetpack/modules/sso.php b/plugins/jetpack/modules/sso.php index f84ba42e..eddd6e97 100644 --- a/plugins/jetpack/modules/sso.php +++ b/plugins/jetpack/modules/sso.php @@ -436,14 +436,14 @@ class Jetpack_SSO { time() + HOUR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN, - false, + is_ssl(), true ); if ( ! empty( $_GET['redirect_to'] ) ) { // If we have something to redirect to $url = esc_url_raw( $_GET['redirect_to'] ); - setcookie( 'jetpack_sso_redirect_to', $url, time() + HOUR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN, false, true ); + setcookie( 'jetpack_sso_redirect_to', $url, time() + HOUR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN, is_ssl(), true ); } elseif ( ! empty( $_COOKIE['jetpack_sso_redirect_to'] ) ) { // Otherwise, if it's already set, purge it. setcookie( 'jetpack_sso_redirect_to', ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN ); @@ -539,7 +539,8 @@ class Jetpack_SSO { ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } @@ -549,7 +550,8 @@ class Jetpack_SSO { ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } } @@ -567,7 +569,8 @@ class Jetpack_SSO { ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } @@ -577,7 +580,8 @@ class Jetpack_SSO { ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } @@ -587,7 +591,8 @@ class Jetpack_SSO { ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } } @@ -637,7 +642,8 @@ class Jetpack_SSO { $nonce, time() + ( 10 * MINUTE_IN_SECONDS ), COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } @@ -1043,7 +1049,8 @@ class Jetpack_SSO { $user_data->display_name, time() + WEEK_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); setcookie( @@ -1054,7 +1061,8 @@ class Jetpack_SSO { ), time() + WEEK_IN_SECONDS, COOKIEPATH, - COOKIE_DOMAIN + COOKIE_DOMAIN, + is_ssl() ); } |