Ticket #40736: php33xaUA

Index: src/wp-includes/ms-functions.php
===================================================================
--- src/wp-includes/ms-functions.php    (revision 40848)
+++ src/wp-includes/ms-functions.php    (working copy)
@@ -102,7 +102,7 @@
  * @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 intval( get_network_option( $network_id, 'user_count' ) );
 }
 
 /**
@@ -111,6 +111,10 @@
  * The count is cached and updated twice daily. This is not a live count.
  *
  * @since MU 1.0
+ *
+ * @deprecated 4.8 Use get_site_count()
+ * @see get_site_count()
+ *
  * @since 3.7.0 The $network_id parameter has been deprecated.
  * @since 4.8.0 The $network_id parameter is now being used.
  *
@@ -118,10 +122,25 @@
  * @return int Number of active sites on the network.
  */
 function get_blog_count( $network_id = null ) {
-       return get_network_option( $network_id, 'blog_count' );
+       _deprecated_function( __FUNCTION__, '4.8', 'get_site_count()' );
+       return get_site_count( $network_id  );
 }
 
 /**
+ * The number of active sites on your installation.
+ *
+ * The count is cached and updated twice daily. This is not a live count.
+ *
+ * @since MU 4.8
+ *
+ * @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_site_count( $network_id = null ) {
+       return intval( get_network_option( $network_id, 'blog_count' ) );
+}
+
+/**
  * Get a blog post from any site on the network.
  *
  * @since MU 1.0