Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Bootstrap/Load: Remove WP_Recovery_Mode_Cookie_Service constructor to avoid referencing cookie constants before they are defined.

Browse Source 
Instantiating `WP_Recovery_Mode` should no longer have any required timing.

Props TimothyBlynJacobs, lkraav.
Fixes #46882.
Built from https://develop.svn.wordpress.org/trunk@45205


git-svn-id: http://core.svn.wordpress.org/trunk@45014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-04-15 22:44:52 +00:00
parent d4d1267847
commit c75d21589d
2 changed files with 11 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
wp-includes/class-wp-recovery-mode-cookie-service.php
View File

@ -13,69 +13,6 @@
*/
final class WP_Recovery_Mode_Cookie_Service {
/**
* The cookie name to use.
*
* @since 5.2.0
* @var string
*/
private $name;
/**
* The domain the cookie should be set on, {@see setcookie()}.
*
* @since 5.2.0
* @var string
*/
private $domain;
/**
* The path to limit the cookie to, {@see setcookie()}.
*
* @since 5.2.0
* @var string
*/
private $path;
/**
* The path to use when the home_url and site_url are different.
*
* @since 5.2.0
* @var string
*/
private $site_path;
/**
* WP_Recovery_Mode_Cookie_Service constructor.
*
* @since 5.2.0
*
* @param array $opts {
* Recovery mode cookie options.
*
* @type string $name Cookie name.
* @type string $domain Cookie domain.
* @type string $path Cookie path.
* @type string $site_path Site cookie path.
* }
*/
public function __construct( array $opts = array() ) {
$opts = wp_parse_args(
$opts,
array(
'name' => RECOVERY_MODE_COOKIE,
'domain' => COOKIE_DOMAIN,
'path' => COOKIEPATH,
'site_path' => SITECOOKIEPATH,
)
);
$this->name = $opts['name'];
$this->domain = $opts['domain'];
$this->path = $opts['path'];
$this->site_path = $opts['site_path'];
}
/**
* Checks whether the recovery mode cookie is set.
*
@ -84,7 +21,7 @@ final class WP_Recovery_Mode_Cookie_Service {
* @return bool True if the cookie is set, false otherwise.
*/
public function is_cookie_set() {
return ! empty( $_COOKIE[ $this->name ] );
return ! empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] );
}
/**
@ -98,10 +35,10 @@ final class WP_Recovery_Mode_Cookie_Service {
$value = $this->generate_cookie();
setcookie( $this->name, $value, 0, $this->path, $this->domain, is_ssl(), true );
setcookie( RECOVERY_MODE_COOKIE, $value, 0, COOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
if ( $this->path !== $this->site_path ) {
setcookie( $this->name, $value, 0, $this->site_path, $this->domain, is_ssl(), true );
if ( COOKIEPATH !== SITECOOKIEPATH ) {
setcookie( RECOVERY_MODE_COOKIE, $value, 0, SITECOOKIEPATH, COOKIE_DOMAIN, is_ssl(), true );
}
}
@ -111,8 +48,8 @@ final class WP_Recovery_Mode_Cookie_Service {
* @since 5.2.0
*/
public function clear_cookie() {
setcookie( $this->name, ' ', time() - YEAR_IN_SECONDS, $this->path, $this->domain );
setcookie( $this->name, ' ', time() - YEAR_IN_SECONDS, $this->site_path, $this->domain );
setcookie( RECOVERY_MODE_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
setcookie( RECOVERY_MODE_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
}
/**
@ -127,11 +64,11 @@ final class WP_Recovery_Mode_Cookie_Service {
public function validate_cookie( $cookie = '' ) {
if ( ! $cookie ) {
if ( empty( $_COOKIE[ $this->name ] ) ) {
if ( empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] ) ) {
return new WP_Error( 'no_cookie', __( 'No cookie present.' ) );
}
$cookie = $_COOKIE[ $this->name ];
$cookie = $_COOKIE[ RECOVERY_MODE_COOKIE ];
}
$parts = $this->parse_cookie( $cookie );
@ -182,11 +119,11 @@ final class WP_Recovery_Mode_Cookie_Service {
*/
public function get_session_id_from_cookie( $cookie = '' ) {
if ( ! $cookie ) {
if ( empty( $_COOKIE[ $this->name ] ) ) {
if ( empty( $_COOKIE[ RECOVERY_MODE_COOKIE ] ) ) {
return new WP_Error( 'no_cookie', __( 'No cookie present.' ) );
}
$cookie = $_COOKIE[ $this->name ];
$cookie = $_COOKIE[ RECOVERY_MODE_COOKIE ];
}
$parts = $this->parse_cookie( $cookie );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.2-beta3-45204';
$wp_version = '5.2-beta3-45205';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.