Ticket #8455: 8455.patch

src/bp-xprofile/classes/class-bp-xprofile-profiledata.php

@@ -357 +357 @@
                                 $cache_key = "{$user_id}:{$field_id}";
 
                                 // If a value was found, cache it.
-                                if ( isset( $queried_data[ $field_id ] ) ) {
+                                if ( isset( $queried_data[ $field_id ] ) && ! isset( $field_type_objects[ $field_id ]->wp_user_key ) ) {
                                         wp_cache_set( $cache_key, $queried_data[ $field_id ], 'bp_xprofile_data' );
 
                                 // If no value was found, cache an empty item
@@ -373 +373 @@
                                                 $d->table_name = $meta['table_name'];
 
                                         } else {
-                                                $d->id    = '';
-                                                $d->value = '';
+                                                $d->id           = '';
+                                                $d->value        = '';
+                                                $d->table_name   = '';
                                         }
 
-                                        $d->table_name   = '';
                                         $d->user_id      = $user_id;
                                         $d->field_id     = $field_id;
                                         $d->last_updated = '';