Ticket #5098: 5098.01.patch

bp-members/bp-members-functions.php

@@ -149 +149 @@
 /**
  * Fetch everything in the wp_users table for a user, without any usermeta.
  *
- * @package BuddyPress Core
- * @param int $user_id The ID of the user.
+ * @since BuddyPress (1.2.0)
+ *
  * @uses BP_Core_User::get_core_userdata() Performs the query.
+ *
+ * @param int $user_id The ID of the user.
+ * @param bool $requery Should we requery and reset the cache for the user's data.
+ * @return array|bool Array of userdata on success. Boolean false on failure.
  */
-function bp_core_get_core_userdata( $user_id ) {
+function bp_core_get_core_userdata( $user_id = 0, $requery = false ) {
         if ( empty( $user_id ) )
                 return false;
 
-        if ( !$userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' ) ) {
+        // get cache if we're not requerying
+        if ( ! $requery ) {
+                $userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' );
+        }
+
+        // query for userdata if we're explicitly requerying or if cache doesn't exist
+        if ( (bool) $requery === true || $userdata === false ) {
                 $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 );
+        return apply_filters( 'bp_core_get_core_userdata', $userdata, $user_id );
 }
 
 /**

bp-settings/bp-settings-actions.php

@@ -143 +143 @@
 
                 // Make sure these changes are in $bp for the current page load
                 if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( $update_user ) ) ) {
-                        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
+                        $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id(), true );
                 }
 
         // Password Error