From 09fc7ba6ae17ab176e8b9d09347fa1bf0558fd7a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 16 Jul 2019 13:14:45 +0000 Subject: [PATCH] Docs: Move the `do_mu_upgrade` DocBlock out of the preceding `if` statement. Props ChriCo, dkarfa. Fixes #47710. git-svn-id: https://develop.svn.wordpress.org/trunk@45643 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/admin.php | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/wp-admin/admin.php b/src/wp-admin/admin.php index 9be5901df8..8e2ce255d1 100644 --- a/src/wp-admin/admin.php +++ b/src/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(); /*