use current site domain for cookie domain when cookie domain not set, See #12142
git-svn-id: https://develop.svn.wordpress.org/trunk@13127 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
3da1c8bb17
commit
0a4e820ba1
@ -61,8 +61,12 @@ function ms_cookie_constants( ) {
|
||||
/**
|
||||
* @since 2.0.0
|
||||
*/
|
||||
if ( !defined('COOKIE_DOMAIN') )
|
||||
define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
|
||||
if ( !defined('COOKIE_DOMAIN') ) {
|
||||
if ( isset( $current_site->cookie_domain ) )
|
||||
define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
|
||||
else
|
||||
define('COOKIE_DOMAIN', '.' . $current_site->domain);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -85,4 +89,4 @@ function ms_file_constants( ) {
|
||||
if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
|
||||
define( 'WPMU_ACCEL_REDIRECT', false );
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user