WordPress.org

Make WordPress Core

Changeset 13058


Ignore:
Timestamp:
02/11/2010 10:51:51 PM (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/pluggable.php

    r12828 r13058  
    13021302            $secret_key = AUTH_KEY;
    13031303
    1304         if ( defined('AUTH_SALT') ) {
     1304        if ( defined('AUTH_SALT') && ('' != AUTH_SALT) && ( $wp_default_secret_key != AUTH_SALT) ) {
    13051305            $salt = AUTH_SALT;
    1306         } elseif ( defined('SECRET_SALT') ) {
     1306        } elseif ( defined('SECRET_SALT') && ('' != SECRET_SALT) && ( $wp_default_secret_key != SECRET_SALT) ) {
    13071307            $salt = SECRET_SALT;
    13081308        } else {
     
    13171317            $secret_key = SECURE_AUTH_KEY;
    13181318
    1319         if ( defined('SECURE_AUTH_SALT') ) {
     1319        if ( defined('SECURE_AUTH_SALT') && ('' != SECURE_AUTH_SALT) && ( $wp_default_secret_key != SECURE_AUTH_SALT) ) {
    13201320            $salt = SECURE_AUTH_SALT;
    13211321        } else {
     
    13301330            $secret_key = LOGGED_IN_KEY;
    13311331
    1332         if ( defined('LOGGED_IN_SALT') ) {
     1332        if ( defined('LOGGED_IN_SALT') && ('' != LOGGED_IN_SALT) && ( $wp_default_secret_key != LOGGED_IN_SALT) ) {
    13331333            $salt = LOGGED_IN_SALT;
    13341334        } else {
     
    13431343            $secret_key = NONCE_KEY;
    13441344
    1345         if ( defined('NONCE_SALT') ) {
     1345        if ( defined('NONCE_SALT') && ('' != NONCE_SALT) && ( $wp_default_secret_key != NONCE_SALT) ) {
    13461346            $salt = NONCE_SALT;
    13471347        } else {
Note: See TracChangeset for help on using the changeset viewer.