Changeset 49163

Timestamp:

10/15/2020 09:14:35 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Bootstrap/Load: Don't assume WP_CONTENT_DIR is defined.

When the mysql extention isn't loaded and a custom db dropin is not in place, we give folks a nice error. However, we can't assume that the WP_CONTENT_DIR constant is set yet since this runs before we define default constants.

This fixes a PHP 8 error.

Props jorbin.
Merges [49161] to trunk.
See #50913.

File:

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

trunk/src/wp-includes/load.php

@@ -154 +154 @@
     }
 
-    if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+    if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' )
+        // This runs before default constants are defined, so we can't assume WP_CONTENT_DIR is set yet.
+        && ( defined( 'WP_CONTENT_DIR' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' )
+            || ! file_exists( ABSPATH . 'wp-content/db.php' ) )
+    ) {
         require_once ABSPATH . WPINC . '/functions.php';
         wp_load_translations_early();