From 03eac5614cede34025d0a6eb4406fc5fd22576ba Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 12 Mar 2010 00:03:44 +0000 Subject: [PATCH] Fix notice on users admin panel. More or less reverts earlier fix, [13617]. props miqrogroove. fixes #12555 git-svn-id: http://svn.automattic.com/wordpress/trunk@13680 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/users.php | 2 +- wp-includes/user.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/wp-admin/users.php b/wp-admin/users.php index c0db41639..83ed449ee 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -370,7 +370,7 @@ foreach ( $wp_user_search->get_results() as $userid ) { $role = array_shift($roles); $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"'; - echo "\n\t", user_row($user_object, $style, $role, isset( $post_counts[ $userid ] ) ? $post_counts[ $userid ] : 0 ); + echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] ); } ?> diff --git a/wp-includes/user.php b/wp-includes/user.php index 7c5ab5c02..a55f5f09d 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -169,17 +169,13 @@ function count_many_users_posts($users) { global $wpdb; $count = array(); - if ( ! count( $users ) ) + if ( ! is_array($users) || empty( $users ) ) return $count; $userlist = implode( ',', $users ); $where = get_posts_by_author_sql( 'post' ); $result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N ); - - if ( ! $result ) - return $count; - foreach ( $result as $row ) { $count[ $row[0] ] = $row[1]; }