From 268402c8a71521c658dae15723090be9d6aa0129 Mon Sep 17 00:00:00 2001
From: Pantheon Automation <bot@getpantheon.com>
Date: Fri, 30 Oct 2020 22:05:30 +0000
Subject: [PATCH] Update to WordPress 5.5.3. For more information, see
 https://wordpress.org/news/2020/10/wordpress-5-5-3-maintenance-release/

---
 wp-admin/about.php        | 25 +++++++++++++++++++++++++
 wp-includes/functions.php |  5 ++++-
 wp-includes/version.php   |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 2a2ad12fa1..68fa12422f 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -64,6 +64,31 @@
 		<div class="about__section has-subtle-background-color">
 			<div class="column">
 				<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
+				<p>
+					<?php
+					printf(
+						/* translators: 1: WordPress version number, 2: Plural number of bugs. */
+						_n(
+							'<strong>Version %1$s</strong> addressed %2$s bug.',
+							'<strong>Version %1$s</strong> addressed %2$s bugs.',
+							1
+						),
+						'5.5.3',
+						number_format_i18n( 1 )
+					);
+					?>
+					<?php
+					printf(
+						/* translators: %s: HelpHub URL. */
+						__( 'For more information, see <a href="%s">the release notes</a>.' ),
+						sprintf(
+							/* translators: %s: WordPress version. */
+							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+							sanitize_title( '5.5.3' )
+						)
+					);
+					?>
+				</p>
 				<p>
 					<?php
 					printf(
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 12e7e05a33..f1aa39f353 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1754,7 +1754,10 @@ function is_blog_installed() {
 		}
 
 		$described_table = $wpdb->get_results( "DESCRIBE $table;" );
-		if ( is_array( $described_table ) && count( $described_table ) === 0 ) {
+		if (
+			( ! $described_table && empty( $wpdb->last_error ) ) ||
+			( is_array( $described_table ) && 0 === count( $described_table ) )
+		) {
 			continue;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3c82f84ccd..07ce56bc65 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5.2';
+$wp_version = '5.5.3';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.