Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use current site domain for cookie domain when cookie domain not set, See #12142 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-14 00:12:08 +00:00
parent 98e8daa20a
commit 99c15de631
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/ms-default-constants.php
View File

@ -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 );
}
?>
?>