Ticket #12555: 12555.proper.diff

wp-admin/users.php

@@ -370 +370 @@
         $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 ] );
 }
 ?>
 </tbody>

wp-includes/user.php

@@ -169 +169 @@
         global $wpdb;
 
         $count = array();
-        if ( ! count( $users ) )
+        if ( ! is_array($users) || empty( $users ) )
                 return $count;
 
         $userlist = implode( ',', $users );
@@ -177 +177 @@
 
         $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 ) {
+        foreach ( $result as $row )
                 $count[ $row[0] ] = $row[1];
-        }
 
-        foreach ( $users as $id ) {
+        foreach ( $users as $id )
                 if ( ! isset( $count[ $id ] ) )
                         $count[ $id ] = 0;
-        }
 
         return $count;
 }