Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 13:24:57 +02:00
Code Issues Projects Releases Wiki Activity

Avoid confusion by clarifying an inline comment on logic for performing multisite upgrades.

Browse Source 
Props dmchale for the initial patch.
Fixes #30837.

Built from https://develop.svn.wordpress.org/trunk@31297


git-svn-id: http://core.svn.wordpress.org/trunk@31278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-01-29 11:53:21 +00:00
parent 9a17233ca1
commit de1f0a0487
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/admin.php
View File

@ -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' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31296';
$wp_version = '4.2-alpha-31297';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.