Changeset 40370 for trunk/src/wp-includes/ms-functions.php

Timestamp:

04/03/2017 11:13:40 PM (8 years ago)

Author:

flixos90

Message:

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

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.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -110 +110 @@
  *
  * @since MU 1.0
- *
- * @param int $network_id Deprecated, not supported.
- * @return int
- */
-function get_blog_count( $network_id = 0 ) {
-    if ( func_num_args() )
-        _deprecated_argument( __FUNCTION__, '3.1.0' );
-
-    return get_site_option( 'blog_count' );
+ * @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|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 = null ) {
+    return get_network_option( $network_id, 'blog_count' );
 }