Make WordPress Core

Changeset 42239 for branches/3.9


Ignore:
Timestamp:
11/27/2017 01:12:40 AM (6 years ago)
Author:
dd32
Message:

WPDB: Check that AUTH_SALT is not empty, Fix a PHP notice when AUTH_SALT is undefined.

Props jsonfry, mkomar, pento.
Merges [42119] and [42120] to the 3.9 branch.
Fixes #42431 and #42401 for 3.9.

Location:
branches/3.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.9

  • branches/3.9/src/wp-includes/wp-db.php

    r42066 r42239  
    17681768            $algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
    17691769            // Old WP installs may not have AUTH_SALT defined.
    1770             $salt = defined( 'AUTH_SALT' ) ? AUTH_SALT : rand();
     1770            $salt = defined( 'AUTH_SALT' ) && AUTH_SALT ? AUTH_SALT : (string) rand();
    17711771
    17721772            $placeholder = '{' . hash_hmac( $algo, uniqid( $salt, true ), $salt ) . '}';
Note: See TracChangeset for help on using the changeset viewer.