Ticket #12711: 12711.2.patch

wp-admin/users.php

@@ -368 +368 @@
         $user_object = new WP_User($userid);
         $roles = $user_object->roles;
         $role = array_shift($roles);
-
-        $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-        echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
+        if ( is_multisite() && ! empty($role) ) {
+                $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+                echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
+        }
 }
 ?>
 </tbody>

wp-includes/capabilities.php

@@ -698 +698 @@
         function remove_all_caps() {
                 global $wpdb;
                 $this->caps = array();
-                update_user_meta( $this->ID, $this->cap_key, '' );
-                update_user_meta( $this->ID, $wpdb->prefix . 'user_level', '' );
+                delete_user_meta( $this->ID, $this->cap_key, '' );
+                delete_user_meta( $this->ID, $wpdb->prefix . 'user_level', '' );
                 $this->get_role_caps();
         }