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

Fix string offset PHP 5.4 error by normalizing $user_count to always be an integer. props ericmann. see #20966 for trunk. 

git-svn-id: http://core.svn.wordpress.org/trunk@21105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-06-25 19:40:16 +00:00
parent efb07c689e
commit 69e9cf2888
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/update.php
View File

@ -58,6 +58,7 @@ function wp_version_check() {
$multisite_enabled = 1; $multisite_enabled = 1;
} else { } else {
$user_count = count_users( ); $user_count = count_users( );
$user_count = $user_count['total_users'];
$multisite_enabled = 0; $multisite_enabled = 0;
$num_blogs = 1; $num_blogs = 1;
$wp_install = home_url( '/' ); $wp_install = home_url( '/' );
@ -70,7 +71,7 @@ function wp_version_check() {
'mysql' => $mysql_version, 'mysql' => $mysql_version,
'local_package' => isset( $wp_local_package ) ? $wp_local_package : '', 'local_package' => isset( $wp_local_package ) ? $wp_local_package : '',
'blogs' => $num_blogs, 'blogs' => $num_blogs,
'users' => $user_count['total_users'], 'users' => $user_count,
'multisite_enabled' => $multisite_enabled 'multisite_enabled' => $multisite_enabled
); );