Changeset 56152

Timestamp:

07/06/2023 01:52:56 PM (3 years ago)

Author:

audrasjb

Message:

Boostrap/Load: Incorrect condition in wp_check_php_mysql_versions().

This changeset adds a check for the existence of db.php at the default path ABSPATH . 'wp-content/db.php', even if WP_CONTENT_DIR is defined and db.php
is placed in WP_CONTENT_DIR.

Follow-up to [49161].

Props mikeyzm, SergeyBiryukov, hztyfoon,
Fixes #58201.

File:

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

trunk/src/wp-includes/load.php

@@ -163 +163 @@
         }
 
-        if ( ! function_exists( 'mysqli_connect' ) && ! function_exists( 'mysql_connect' )
-                // 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' ) )
+        // This runs before default constants are defined, so we can't assume WP_CONTENT_DIR is set yet.
+        $wp_content_dir = defined( 'WP_CONTENT_DIR' ) ? WP_CONTENT_DIR : ABSPATH . 'wp-content';
+
+        if ( ! function_exists( 'mysqli_connect' )
+                && ! function_exists( 'mysql_connect' )
+                && ! file_exists( $wp_content_dir . '/db.php' )
         ) {
                 require_once ABSPATH . WPINC . '/functions.php';