Ticket #7595: 7595.diff

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

@@ -749 +749 @@
         /**
          * Get WordPress user details for a specified user.
          *
-         * @global wpdb $wpdb WordPress database object.
+         * @since 3.0.0 Results might be from cache
          *
          * @param int $user_id User ID.
-         * @return array Associative array.
+         * @return false|object WP_User if successful, false on failure.
          */
         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 WP_User::get_data_by( 'id', $user_id );
         }
 
         /**

src/bp-core/classes/class-bp-user-query.php

@@ -570 +570 @@
 
                 ), $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

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

@@ -214 +214 @@
                 return false;
         }
 
-        $userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' );
+        // Get core user data
+        $userdata = BP_Core_User::get_core_userdata( $user_id );
 
-        // No cache.
-        if ( false === $userdata ) {
-                $userdata = BP_Core_User::get_core_userdata( $user_id );
-
-                // Cache data; no-result is cached as integer 0.
-                wp_cache_set( 'bp_core_userdata_' . $user_id, false === $userdata ? 0 : $userdata, 'bp' );
-
-        // Cached no-result, so set return value as false as expected.
-        } elseif ( 0 === $userdata ) {
-                $userdata = false;
-        }
-
         /**
          * Filters the userdata for a passed user.
          *

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

@@ -178 +178 @@
                 // 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() );
                 }
 
@@ -454 +453 @@
                 ) );
 
                 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' );

src/bp-xprofile/bp-xprofile-functions.php

@@ -836 +836 @@
         bp_update_user_meta( $user_id, 'last_name',  $lastname  );
 
         wp_update_user( array( 'ID' => $user_id, 'display_name' => $fullname ) );
-        wp_cache_delete( 'bp_core_userdata_' . $user_id, 'bp' );
 }
 add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
 add_action( 'bp_core_signup_user',      'xprofile_sync_wp_profile' );

tests/phpunit/testcases/members/cache.php

@@ -78 +78 @@
                 $this->assertEqualSets( $b1, $b2 );
                 $this->assertSame( $num_queries, $wpdb->num_queries );
         }
-
-        /**
-         * @group bp_core_get_core_userdata
-         */
-        public function test_bp_core_get_core_userdata_should_cache_no_results() {
-                // Get the userdata for a user that doesn't exist.
-                bp_core_get_core_userdata( PHP_INT_MAX );
-
-                // Assert that the non-existent user's attempt was cached.
-                $this->assertNotFalse( wp_cache_get( 'bp_core_userdata_' . PHP_INT_MAX, 'bp' ) );
-        }
 }