X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/849f15aeed7a5e39314057bdc0064d8edd60dd7d..58b0523c599c731e868bd4bc05b0d686a98d254f:/wp-admin/admin.php diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 793dc511..22813cc7 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -63,7 +63,11 @@ if ( get_option('db_upgraded') ) { */ } elseif ( apply_filters( 'do_mu_upgrade', true ) ) { $c = get_blog_count(); - // If 50 or fewer sites, run every time. Else, run "about ten percent" of the time. Shh, don't check that math. + + /* + * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load: + * 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' ); $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); @@ -90,6 +94,15 @@ $time_format = get_option('time_format'); wp_enqueue_script( 'common' ); +// $pagenow is set in vars.php +// $wp_importers is sometimes set in wp-admin/includes/import.php +// +// The remaining variables are imported as globals elsewhere, +// declared as globals here +global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow; + +$page_hook = null; + $editing = false; if ( isset($_GET['page']) ) { @@ -167,12 +180,13 @@ if ( isset($plugin_page) ) { } $hook_suffix = ''; -if ( isset($page_hook) ) +if ( isset( $page_hook ) ) { $hook_suffix = $page_hook; -else if ( isset($plugin_page) ) +} elseif ( isset( $plugin_page ) ) { $hook_suffix = $plugin_page; -else if ( isset($pagenow) ) +} elseif ( isset( $pagenow ) ) { $hook_suffix = $pagenow; +} set_current_screen(); @@ -206,7 +220,7 @@ if ( isset($plugin_page) ) { /** * Used to call the registered callback for a plugin screen. * - * @internal + * @ignore * @since 1.5.0 */ do_action( $page_hook ); @@ -243,7 +257,7 @@ if ( isset($plugin_page) ) { include(ABSPATH . 'wp-admin/admin-footer.php'); exit(); -} else if (isset($_GET['import'])) { +} elseif ( isset( $_GET['import'] ) ) { $importer = $_GET['import'];