Ticket #5979: 5979.02.patch

src/bp-core/bp-core-classes.php

@@ -464 +464 @@
          * @since BuddyPress (1.7.0)
          */
         public function do_wp_user_query() {
-                $fields = array( 'ID', 'user_login', 'user_pass', 'user_nicename', 'user_email', 'user_url', 'user_registered', 'user_activation_key', 'user_status', 'display_name' );
 
-                if ( is_multisite() ) {
-                        $fields[] = 'spam';
-                        $fields[] = 'deleted';
-                }
-
                 $wp_user_query = new WP_User_Query( apply_filters( 'bp_wp_user_query_args', array(
 
                         // Relevant
-                        'fields'      => $fields,
+                        'fields'      => 'all_with_meta',
                         'include'     => $this->user_ids,
 
                         // Overrides
@@ -483 +477 @@
 
                 ), $this ) );
 
-                // WP_User_Query doesn't cache the data it pulls from wp_users,
-                // and it does not give us a way to save queries by fetching
-                // only uncached users. However, BP does cache this data, so
-                // we set it here.
-                foreach ( $wp_user_query->results as $u ) {
-                        wp_cache_set( 'bp_core_userdata_' . $u->ID, $u, 'bp' );
-                }
-
                 // We calculate total_users using a standalone query, except
                 // when a whitelist of user_ids is passed to the constructor.
                 // This clause covers the latter situation, and ensures that
@@ -1328 +1314 @@
          * @return array Associative array.
          */
         public static function get_core_userdata( $user_id ) {
-                global $wpdb;
-
-                if ( !$user = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE ID = %d LIMIT 1", $user_id ) ) )
-                        return false;
-
-                return $user;
+                return get_userdata( $user_id );
         }
 
         /**

src/bp-members/bp-members-functions.php

@@ -178 +178 @@
  * @return array
  */
 function bp_core_get_core_userdata( $user_id = 0 ) {
-        if ( empty( $user_id ) ) {
-                return false;
-        }
 
-        if ( !$userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' ) ) {
-                $userdata = BP_Core_User::get_core_userdata( $user_id );
-                wp_cache_set( 'bp_core_userdata_' . $user_id, $userdata, 'bp' );
-        }
-        return apply_filters( 'bp_core_get_core_userdata', $userdata );
+        $userdata = ! empty( $user_id )
+                ? BP_Core_User::get_core_userdata( $user_id )
+                : false;
+
+        return apply_filters( 'bp_core_get_core_userdata', $userdata, $user_id );
 }
 
 /**

src/bp-settings/bp-settings-actions.php

@@ -196 +196 @@
                 // Clear cached data, so that the changed settings take effect
                 // on the current page load
                 if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( $update_user ) ) ) {
-                        wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), 'bp' );
                         $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
                 }
 
@@ -439 +438 @@
                 ) );
 
                 if ( $email_changed ) {
-                        // Delete object cache for displayed user
-                        wp_cache_delete( 'bp_core_userdata_' . bp_displayed_user_id(), 'bp' );
 
                         // Delete the pending email change key
                         bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );