Ticket #40736: 40736.7.patch

src/wp-includes/ms-deprecated.php

@@ -546 +546 @@
 
         return isset( $current_user->$local_key );
 }
+
+/**
+ * The number of active sites on your installation.
+ *
+ * The count is cached and updated twice daily. This is not a live count.
+ *
+ * @since MU 1.0
+ *
+ * @deprecated 5.0.0 Use get_site_count()
+ * @see get_site_count()
+ *
+ * @since 3.7.0 The $network_id parameter has been deprecated.
+ * @since 4.9.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 ) {
+        _deprecated_function( __FUNCTION__, '5.0', 'get_site_count()' );
+        return get_site_count( $network_id  );
+}

src/wp-includes/ms-functions.php

@@ -107 +107 @@
  * @return int Number of active users on the network.
  */
 function get_user_count( $network_id = null ) {
-        return get_network_option( $network_id, 'user_count' );
+        return (int) get_network_option( $network_id, 'user_count' );
 }
 
 /**
@@ -115 +115 @@
  *
  * The count is cached and updated twice daily. This is not a live count.
  *
- * @since MU (3.0.0)
- * @since 3.7.0 The $network_id parameter has been deprecated.
- * @since 4.8.0 The $network_id parameter is now being used.
+ * @since 5.0.0
  *
  * @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' );
+function get_site_count( $network_id = null ) {
+        return (int) get_network_option( $network_id, 'blog_count' );
 }
 
 /**