WordPress.org

Make WordPress Core

Changeset 42238


Ignore:
Timestamp:
11/27/2017 01:12:10 AM (2 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 4.0 branch.
Fixes #42431 and #42401 for 4.0.

Location:
branches/4.0
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.0

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

    r42065 r42238  
    18041804            $algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
    18051805            // Old WP installs may not have AUTH_SALT defined.
    1806             $salt = defined( 'AUTH_SALT' ) ? AUTH_SALT : rand();
     1806            $salt = defined( 'AUTH_SALT' ) && AUTH_SALT ? AUTH_SALT : (string) rand();
    18071807
    18081808            $placeholder = '{' . hash_hmac( $algo, uniqid( $salt, true ), $salt ) . '}';
Note: See TracChangeset for help on using the changeset viewer.