vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-10 23:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Support the $network_id parameter of get_blog_count().

Browse Source 
The `get_blog_count()` function used to support an `$id` parameter for the network ID prior to WordPress 3.1. This parameter has not been used since the introduction of `get_site_option()` and was later deprecated in [25113]. With `get_network_option()` however it is possible to support the parameter again, now properly renamed as `$network_id`.

A unit test has for the parameter has been added as well. Another unit test in the same class was adjusted to work properly with multiple networks existing.

Fixes #37865.


git-svn-id: https://develop.svn.wordpress.org/trunk@40370 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
flixos90
2017-04-03 23:13:40 +00:00
parent 7734535fe7
commit 117f2da3cc
2 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wp-includes/ms-functions.php
View File

@@ -109,15 +109,14 @@ function get_user_count() {
* The count is cached and updated twice daily. This is not a live count.
*
* @since MU 1.0
* @since 3.7.0 The $network_id parameter has been deprecated.
* @since 4.8.0 The $network_id parameter is now being used.
*
* @param int $network_id Deprecated, not supported.
* @return int
* @param int|null $network_id ID of the network. Default is the current network.
* @return int Number of active sites on the network.
*/
function get_blog_count( $network_id = 0 ) {
if ( func_num_args() )
_deprecated_argument( __FUNCTION__, '3.1.0' );
return get_site_option( 'blog_count' );
function get_blog_count( $network_id = null ) {
return get_network_option( $network_id, 'blog_count' );
}
/**