Ticket #12555: 10607-and-12555.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;
 }

wp-includes/wp-db.php

@@ -445 +445 @@
         var $dbuser;
 
         /**
+         * {@internal Missing Description}}
+         *
+         * @since unknown
+         * @access public
+         * @var unknown
+         */
+        var $func_call;
+
+        /**
          * Connects to the database server and selects a database
          *
          * PHP4 compatibility layer for calling the PHP5 constructor.
@@ -1387 +1396 @@
                 } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
                         // Return an integer-keyed array of...
                         if ( $this->last_result ) {
-                                $i = 0;
                                 foreach( (array) $this->last_result as $row ) {
                                         if ( $output == ARRAY_N ) {
                                                 // ...integer-keyed row arrays
-                                                $new_array[$i] = array_values( get_object_vars( $row ) );
+                                                $new_array[] = array_values( get_object_vars( $row ) );
                                         } else {
                                                 // ...column name-keyed row arrays
-                                                $new_array[$i] = get_object_vars( $row );
+                                                $new_array[] = get_object_vars( $row );
                                         }
-                                        ++$i;
                                 }
-                                return $new_array;
                         }
+                        return $new_array;
                 }
+                return null;
         }
 
         /**