From 551d27db59b585c923247e251ab690b649077af8 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Mon, 27 Nov 2017 01:09:36 +0000 Subject: [PATCH] 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.6 branch. Fixes #42431 and #42401 for 4.6. Built from https://develop.svn.wordpress.org/branches/4.6@42232 git-svn-id: http://core.svn.wordpress.org/branches/4.6@42061 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/wp-db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 8fe9969afa..2b096ecc4e 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1960,7 +1960,7 @@ class wpdb { // If ext/hash is not present, compat.php's hash_hmac() does not support sha256. $algo = function_exists( 'hash' ) ? 'sha256' : 'sha1'; // Old WP installs may not have AUTH_SALT defined. - $salt = defined( 'AUTH_SALT' ) ? AUTH_SALT : rand(); + $salt = defined( 'AUTH_SALT' ) && AUTH_SALT ? AUTH_SALT : (string) rand(); $placeholder = '{' . hash_hmac( $algo, uniqid( $salt, true ), $salt ) . '}'; }