Changeset 42241 for branches/3.7

Timestamp:

11/27/2017 01:14:05 AM (7 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.7 branch.
Fixes #42431 and #42401 for 3.7.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)

branches/3.7/src/wp-includes/wp-db.php

@@ -1395 +1395 @@
             $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 ) . '}';