From e466bb9d65a28f4e9f927ac244fa5d680d6e5bda Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 29 Nov 2010 05:27:01 +0000
Subject: [PATCH] Use get_user_count() if multisite in wp_version_check. props
 PeteMall, fixes #15599.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/update.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-includes/update.php b/wp-includes/update.php
index 51fbe7e7c..ca0412ff4 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -44,14 +44,16 @@ function wp_version_check() {
 	else
 		$mysql_version = 'N/A';
 
-	$num_blogs = 1;
-	$wp_install = home_url( '/' );
-	$multisite_enabled = 0;
-	$user_count = count_users( );
 	if ( is_multisite( ) ) {
+		$user_count = get_user_count( );
 		$num_blogs = get_blog_count( );
 		$wp_install = network_site_url( );
 		$multisite_enabled = 1;
+	} else {
+		$user_count = count_users( );
+		$multisite_enabled = 0;
+		$num_blogs = 1;
+		$wp_install = home_url( '/' );
 	}
 
 	$local_package = isset( $wp_local_package )? $wp_local_package : '';