Changeset 13058

Timestamp:

02/11/2010 10:51:51 PM (15 years ago)

Author:

westi

Message:

Ensure we ignore the _SALT defines if they are set to the "default" unconfigured values or empty. See #12159.

File:

• trunk/wp-includes/pluggable.php (modified) (4 diffs)

trunk/wp-includes/pluggable.php

@@ -1302 +1302 @@
             $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 {
@@ -1317 +1317 @@
             $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 {
@@ -1330 +1330 @@
             $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 {
@@ -1343 +1343 @@
             $secret_key = NONCE_KEY;
 
-        if ( defined('NONCE_SALT') ) {
+        if ( defined('NONCE_SALT') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
             $salt = NONCE_SALT;
         } else {