Bootstrap/Load: Update the domain parsing when initialising the cookie domain on Multisite.

This ensures the cookie domain is set to the bare domain without a port number, if one is present.

Props spacedmonkey

Fixes #21077

Built from https://develop.svn.wordpress.org/trunk@58138


git-svn-id: http://core.svn.wordpress.org/trunk@57603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2024-05-13 13:34:11 +00:00
parent 39c3bec9f3
commit a59eb9d39c
2 changed files with 3 additions and 3 deletions

View File

@ -307,8 +307,8 @@ class WP_Network {
if ( ! empty( $this->cookie_domain ) ) {
return;
}
$this->cookie_domain = $this->domain;
$domain = parse_url( $this->domain, PHP_URL_HOST );
$this->cookie_domain = is_string( $domain ) ? $domain : $this->domain;
if ( str_starts_with( $this->cookie_domain, 'www.' ) ) {
$this->cookie_domain = substr( $this->cookie_domain, 4 );
}

View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.6-alpha-58137';
$wp_version = '6.6-alpha-58138';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.