From f2b876135c2b39051abffeb064eac8a59bfeee4e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 15 Oct 2020 21:19:05 +0000
Subject: [PATCH] Bootstrap/Load: Revert [49161] from the 5.5 branch.

See #50913.
Built from https://develop.svn.wordpress.org/branches/5.5@49164


git-svn-id: http://core.svn.wordpress.org/branches/5.5@48926 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php    | 6 +-----
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 8b6d3ac607..8cc14e06db 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -112,11 +112,7 @@ function wp_check_php_mysql_versions() {
 		exit( 1 );
 	}
 
-	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' ) ) )
-		) {
+	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
 		require_once ABSPATH . WPINC . '/functions.php';
 		wp_load_translations_early();
 		$args = array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4c633a6267..62a3d3848a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5.2-alpha-49161';
+$wp_version = '5.5.2-alpha-49164';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.