Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 06:45:07 +02:00
Code Issues Projects Releases Wiki Activity

Multisite: Add $network_id parameter to wp_update_network_site_counts().

Browse Source 
Using the new parameter, it is now possible to update the site counts on a network different from the current network.

Props PieWP, johnjamesjacoby.
Fixes #37528. See #38699.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40360 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2017-04-20 00:00:42 +00:00
parent 35987df4e4
commit 7fa610b34a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/ms-functions.php
View File

@ -2329,21 +2329,25 @@ function wp_maybe_update_network_user_counts() {
* Update the network-wide site count. * Update the network-wide site count.
* *
* @since 3.7.0 * @since 3.7.0
* @since 4.8.0 The $network_id parameter has been added.
* *
* @global wpdb $wpdb WordPress database abstraction object. * @param int|null $network_id ID of the network. Default is the current network.
*/ */
function wp_update_network_site_counts() { function wp_update_network_site_counts( $network_id = null ) {
global $wpdb; $network_id = (int) $network_id;
if ( ! $network_id ) {
$network_id = get_current_network_id();
}
$count = get_sites( array( $count = get_sites( array(
'network_id' => $wpdb->siteid, 'network_id' => $network_id,
'spam' => 0, 'spam' => 0,
'deleted' => 0, 'deleted' => 0,
'archived' => 0, 'archived' => 0,
'count' => true, 'count' => true,
) ); ) );
update_site_option( 'blog_count', $count ); update_network_option( $network_id, 'blog_count', $count );
} }
/** /**

2
wp-includes/version.php
View File

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