Ticket #47710: 47710.1.patch

wp-admin/admin.php

@@ -31 +31 @@
         define( 'WP_LOAD_IMPORTERS', true );
 }
 
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( dirname( __FILE__ ) ) . '/wp-load.php';
 
 nocache_headers();
 
@@ -49 +49 @@
         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 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 3.0.0
+         *
+         * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
+         */
+        $do_mu_upgrade = apply_filters( 'do_mu_upgrade', true );
+
+        if ( $do_mu_upgrade ) {
                 $c = get_blog_count();
 
                 /*
@@ -72 +75 @@
                  * attempt to do no more than threshold value, with some +/- allowed.
                  */
                 if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
-                        require_once( ABSPATH . WPINC . '/http.php' );
+                        require_once ABSPATH . WPINC . '/http.php';
                         $response = wp_remote_get(
                                 admin_url( 'upgrade.php?step=1' ),
                                 array(
@@ -88 +91 @@
         }
 }
 
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 auth_redirect();
 
@@ -145 +148 @@
 }
 
 if ( WP_NETWORK_ADMIN ) {
-        require( ABSPATH . 'wp-admin/network/menu.php' );
+        require ABSPATH . 'wp-admin/network/menu.php';
 } elseif ( WP_USER_ADMIN ) {
-        require( ABSPATH . 'wp-admin/user/menu.php' );
+        require ABSPATH . 'wp-admin/user/menu.php';
 } else {
-        require( ABSPATH . 'wp-admin/menu.php' );
+        require ABSPATH . 'wp-admin/menu.php';
 }
 
 if ( current_user_can( 'manage_options' ) ) {
@@ -230 +233 @@
                  */
                 do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
                 if ( ! isset( $_GET['noheader'] ) ) {
-                        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                        require_once ABSPATH . 'wp-admin/admin-header.php';
                 }
 
                 /**
@@ -275 +278 @@
                 do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
                 if ( ! isset( $_GET['noheader'] ) ) {
-                        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                        require_once ABSPATH . 'wp-admin/admin-header.php';
                 }
 
                 if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
-                        include( WPMU_PLUGIN_DIR . "/$plugin_page" );
+                        include WPMU_PLUGIN_DIR . "/$plugin_page";
                 } else {
-                        include( WP_PLUGIN_DIR . "/$plugin_page" );
+                        include WP_PLUGIN_DIR . "/$plugin_page";
                 }
         }
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
         exit();
 } elseif ( isset( $_GET['import'] ) ) {
@@ -320 +323 @@
         $title        = __( 'Import' );
 
         if ( ! isset( $_GET['noheader'] ) ) {
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
         }
 
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
         define( 'WP_IMPORTING', true );
 
@@ -343 +346 @@
 
         call_user_func( $wp_importers[ $importer ][2] );
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
         // Make sure rules are flushed
         flush_rewrite_rules( false );