From 62216de5d4ef550465850187f198791399cb621c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 16 Jul 2019 13:15:58 +0000
Subject: [PATCH] Docs: Move the `do_mu_upgrade` DocBlock out of the preceding
 `if` statement.

Props ChriCo, dkarfa.
Fixes #47710.
Built from https://develop.svn.wordpress.org/trunk@45643


git-svn-id: http://core.svn.wordpress.org/trunk@45454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin.php      | 31 ++++++++++++++++---------------
 wp-includes/version.php |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 9be5901df8..8e2ce255d1 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -49,22 +49,23 @@ if ( get_option( 'db_upgraded' ) ) {
 	if ( ! is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;
+	}
 
-		/**
-		 * Filters whether to attempt to perform the multisite DB upgrade routine.
-		 *
-		 * In single site, the user would be redirected to wp-admin/upgrade.php.
-		 * In multisite, the DB upgrade routine is automatically fired, but only
-		 * when this filter returns true.
-		 *
-		 * If the network is 50 sites or less, it will run every time. Otherwise,
-		 * it will throttle itself to reduce load.
-		 *
-		 * @since MU (3.0.0)
-		 *
-		 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
-		 */
-	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
+	/**
+	 * Filters whether to attempt to perform the multisite DB upgrade routine.
+	 *
+	 * In single site, the user would be redirected to wp-admin/upgrade.php.
+	 * In multisite, the DB upgrade routine is automatically fired, but only
+	 * when this filter returns true.
+	 *
+	 * If the network is 50 sites or less, it will run every time. Otherwise,
+	 * it will throttle itself to reduce load.
+	 *
+	 * @since MU (3.0.0)
+	 *
+	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
+	 */
+	if ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();
 
 		/*
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9b233b57a4..c76e981c4d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45642';
+$wp_version = '5.3-alpha-45643';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.