Changeset 42701

Timestamp:

02/11/2018 06:46:48 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Database: In require_wp_db(), check if database constants are defined before using them.

Otherwise, wp-admin/setup-config.php triggers an undefined constant warning in PHP 7.2.

Props mariusvw, jryancard for initial patch.
Fixes #35560.

File:

• trunk/src/wp-includes/load.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -419 +419 @@
     }
 
-    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+    $dbuser     = defined( 'DB_USER' ) ? DB_USER : '';
+    $dbpassword = defined( 'DB_PASSWORD' ) ? DB_PASSWORD : '';
+    $dbname     = defined( 'DB_NAME' ) ? DB_NAME : '';
+    $dbhost     = defined( 'DB_HOST' ) ? DB_HOST : '';
+
+    $wpdb = new wpdb( $dbuser, $dbpassword, $dbname, $dbhost );
 }