WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
nacin 2010-11-29 05:27:01 +00:00
parent d0b26b2d43
commit e466bb9d65
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/update.php
View File

@ -44,14 +44,16 @@ function wp_version_check() {
else else
$mysql_version = 'N/A'; $mysql_version = 'N/A';
$num_blogs = 1;
$wp_install = home_url( '/' );
$multisite_enabled = 0;
$user_count = count_users( );
if ( is_multisite( ) ) { if ( is_multisite( ) ) {
$user_count = get_user_count( );
$num_blogs = get_blog_count( ); $num_blogs = get_blog_count( );
$wp_install = network_site_url( ); $wp_install = network_site_url( );
$multisite_enabled = 1; $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 : ''; $local_package = isset( $wp_local_package )? $wp_local_package : '';