From b5a05e6558489ffe5e5ff2f50a759f8cbf40644e Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Thu, 6 Jul 2023 13:54:23 +0000
Subject: [PATCH] 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.



Built from https://develop.svn.wordpress.org/trunk@56152


git-svn-id: http://core.svn.wordpress.org/trunk@55664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php    | 10 ++++++----
 wp-includes/version.php |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index fb5f98d261..fcd5cf256d 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -162,10 +162,12 @@ function wp_check_php_mysql_versions() {
 		exit( 1 );
 	}
 
-	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';
 		wp_load_translations_early();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6e66a2815c..b4460f8b21 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.3-beta3-56151';
+$wp_version = '6.3-beta3-56152';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.