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

use same salts/keys across network, see #12142 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-05-04 22:08:53 +00:00
parent d63a41ca15
commit 7c47fba666
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/pluggable.php
View File

@ -1335,10 +1335,10 @@ function wp_salt($scheme = 'auth') {
} elseif ( defined('SECRET_SALT') && ('' != SECRET_SALT) && ( $wp_default_secret_key != SECRET_SALT) ) {
$salt = SECRET_SALT;
} else {
$salt = get_option('auth_salt');
$salt = get_site_option('auth_salt');
if ( empty($salt) ) {
$salt = wp_generate_password( 64, true, true );
update_option('auth_salt', $salt);
update_site_option('auth_salt', $salt);
}
}
} elseif ( 'secure_auth' == $scheme ) {
@ -1348,10 +1348,10 @@ function wp_salt($scheme = 'auth') {
if ( defined('SECURE_AUTH_SALT') && ('' != SECURE_AUTH_SALT) && ( $wp_default_secret_key != SECURE_AUTH_SALT) ) {
$salt = SECURE_AUTH_SALT;
} else {
$salt = get_option('secure_auth_salt');
$salt = get_site_option('secure_auth_salt');
if ( empty($salt) ) {
$salt = wp_generate_password( 64, true, true );
update_option('secure_auth_salt', $salt);
update_site_option('secure_auth_salt', $salt);
}
}
} elseif ( 'logged_in' == $scheme ) {
@ -1361,10 +1361,10 @@ function wp_salt($scheme = 'auth') {
if ( defined('LOGGED_IN_SALT') && ('' != LOGGED_IN_SALT) && ( $wp_default_secret_key != LOGGED_IN_SALT) ) {
$salt = LOGGED_IN_SALT;
} else {
$salt = get_option('logged_in_salt');
$salt = get_site_option('logged_in_salt');
if ( empty($salt) ) {
$salt = wp_generate_password( 64, true, true );
update_option('logged_in_salt', $salt);
update_site_option('logged_in_salt', $salt);
}
}
} elseif ( 'nonce' == $scheme ) {
@ -1374,10 +1374,10 @@ function wp_salt($scheme = 'auth') {
if ( defined('NONCE_SALT') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
$salt = NONCE_SALT;
} else {
$salt = get_option('nonce_salt');
$salt = get_site_option('nonce_salt');
if ( empty($salt) ) {
$salt = wp_generate_password( 64, true, true );
update_option('nonce_salt', $salt);
update_site_option('nonce_salt', $salt);
}
}
} else {