From 951e583bb4916d97b46e28d566e4e10cd276ba7f Mon Sep 17 00:00:00 2001
From: whyisjake <whyisjake@git.wordpress.org>
Date: Thu, 29 Oct 2020 17:26:03 +0000
Subject: [PATCH] Upgrade/install: Improve logic check when determining
 installation status.

Improve handling of ambiguous return values to determine if a blog is installed.

Props zieladam, xknown.

Built from https://develop.svn.wordpress.org/branches/5.5@49377


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

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b07ecb7f4d..12e7e05a33 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1753,7 +1753,8 @@ function is_blog_installed() {
 			continue;
 		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
+		$described_table = $wpdb->get_results( "DESCRIBE $table;" );
+		if ( is_array( $described_table ) && count( $described_table ) === 0 ) {
 			continue;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 955968a47d..a5ffe22704 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-49376';
+$wp_version = '5.5.2-alpha-49377';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.