mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-28 23:27:39 +02:00
Correctly set the secure
flag for the test cookie based on the login URL scheme, and the same for the user settings cookies based on the admin URL scheme.
Fixes #34159 Built from https://develop.svn.wordpress.org/trunk@34931 git-svn-id: http://core.svn.wordpress.org/trunk@34896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a998ea45e2
commit
95045d629b
@ -812,7 +812,7 @@ function wp_user_settings() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The cookie is not set in the current browser or the saved value is newer.
|
// The cookie is not set in the current browser or the saved value is newer.
|
||||||
$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) );
|
$secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) );
|
||||||
setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
|
setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
|
||||||
setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
|
setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
|
||||||
$_COOKIE['wp-settings-' . $user_id] = $settings;
|
$_COOKIE['wp-settings-' . $user_id] = $settings;
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.4-alpha-34930';
|
$wp_version = '4.4-alpha-34931';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
@ -393,7 +393,7 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Set a cookie now to see if they are supported by the browser.
|
//Set a cookie now to see if they are supported by the browser.
|
||||||
$secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
|
$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );
|
||||||
setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
|
setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
|
||||||
if ( SITECOOKIEPATH != COOKIEPATH )
|
if ( SITECOOKIEPATH != COOKIEPATH )
|
||||||
setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
|
setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
|
||||||
|
Loading…
Reference in New Issue
Block a user