From 582ed1fb9db02ab680539f91d8bbcdcfb830c00b Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Thu, 11 Feb 2010 22:51:51 +0000
Subject: [PATCH] Ensure we ignore the _SALT defines if they are set to the
 "default" unconfigured values or empty. See #12159.

git-svn-id: https://develop.svn.wordpress.org/trunk@13058 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/pluggable.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 2affe5db64..5244ccad15 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1301,9 +1301,9 @@ function wp_salt($scheme = 'auth') {
 		if ( defined('AUTH_KEY') && ('' != AUTH_KEY) && ( $wp_default_secret_key != AUTH_KEY) )
 			$secret_key = AUTH_KEY;
 
-		if ( defined('AUTH_SALT') ) {
+		if ( defined('AUTH_SALT') && ('' != AUTH_SALT) && ( $wp_default_secret_key != AUTH_SALT) ) {
 			$salt = AUTH_SALT;
-		} elseif ( defined('SECRET_SALT') ) {
+		} elseif ( defined('SECRET_SALT') && ('' != SECRET_SALT) && ( $wp_default_secret_key != SECRET_SALT) ) {
 			$salt = SECRET_SALT;
 		} else {
 			$salt = get_option('auth_salt');
@@ -1316,7 +1316,7 @@ function wp_salt($scheme = 'auth') {
 		if ( defined('SECURE_AUTH_KEY') && ('' != SECURE_AUTH_KEY) && ( $wp_default_secret_key != SECURE_AUTH_KEY) )
 			$secret_key = SECURE_AUTH_KEY;
 
-		if ( defined('SECURE_AUTH_SALT') ) {
+		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');
@@ -1329,7 +1329,7 @@ function wp_salt($scheme = 'auth') {
 		if ( defined('LOGGED_IN_KEY') && ('' != LOGGED_IN_KEY) && ( $wp_default_secret_key != LOGGED_IN_KEY) )
 			$secret_key = LOGGED_IN_KEY;
 
-		if ( defined('LOGGED_IN_SALT') ) {
+		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');
@@ -1342,7 +1342,7 @@ function wp_salt($scheme = 'auth') {
 		if ( defined('NONCE_KEY') && ('' != NONCE_KEY) && ( $wp_default_secret_key != NONCE_KEY) )
 			$secret_key = NONCE_KEY;
 
-		if ( defined('NONCE_SALT') ) {
+		if ( defined('NONCE_SALT') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
 			$salt = NONCE_SALT;
 		} else {
 			$salt = get_option('nonce_salt');