Ticket #4365: 4365.filters.patch

src/bp-members/bp-members-template.php

@@ -900 +900 @@
 
                 // Declare local variables
                 $data = false;
+                $type = false;
 
                 // Guess at default $user_id
                 $default_user_id = 0;
@@ -934 +935 @@
 
                 // Get the data for the specific field requested
                 if ( ! empty( $profile_data ) && ! empty( $profile_data[ $r['field'] ]['field_type'] ) && ! empty( $profile_data[ $r['field'] ]['field_data'] ) ) {
-                        $data = xprofile_format_profile_field( $profile_data[ $r['field'] ]['field_type'], $profile_data[ $r['field'] ]['field_data'] );
+                        $data = bp_unserialize_profile_field( $profile_data[ $r['field'] ]['field_data'] );
+                        $type = $profile_data[ $r['field'] ]['field_type'];
                 }
 
-                return apply_filters( 'bp_get_member_profile_data', $data );
+                return apply_filters( 'bp_get_member_profile_data', $data, $type );
         }
 
 /**

src/bp-xprofile/bp-xprofile-filters.php

@@ -30 +30 @@
 add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value_by_type', 8, 2 );
 add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_link_profile_data',          9, 2 );
 
+add_filter( 'xprofile_get_random_profile_data_value',   'xprofile_filter_format_field_value',         1, 2 );
+add_filter( 'xprofile_get_random_profile_data_value',   'xprofile_filter_format_field_value_by_type', 8, 2 );
+
+add_filter( 'bp_get_member_profile_data',               'xprofile_filter_format_field_value',         1, 2 );
+add_filter( 'bp_get_member_profile_data',               'xprofile_filter_format_field_value_by_type', 8, 2 );
+
 add_filter( 'bp_get_the_profile_field_edit_value',      'force_balance_tags' );
 add_filter( 'bp_get_the_profile_field_edit_value',      'esc_html'           );
 

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

@@ -466 +466 @@
  * @global BuddyPress $bp The one true BuddyPress instance
  * @global $wpdb WordPress DB access object.
  * @global $current_user WordPress global variable containing current logged in user information
- * @uses xprofile_format_profile_field() Formats profile field data so it is suitable for display.
+ * @uses bp_unserialize_profile_field() 
  * @return string|bool The fetched random data for the user, or false if no data or no match.
  */
 function xprofile_get_random_profile_data( $user_id, $exclude_fullname = true ) {
@@ -475 +475 @@
         if ( empty( $field_data ) )
                 return false;
 
-        $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
+        $field_data[0]->value = apply_filters( 'xprofile_get_random_profile_data_value', bp_unserialize_profile_field( $field_data[0]->value ), $field_data[0]->type );
 
         if ( empty( $field_data[0]->value ) )
                 return false;
@@ -484 +484 @@
 }
 
 /**
- * Formats a profile field according to its type. [ TODO: Should really be moved to filters ]
+ * Formats a profile field according to its type.
+ * 
+ * @todo Mark as deprecated?  Method is no longer used internally.
  *
  * @package BuddyPress Core
  * @param string $field_type The type of field: datebox, selectbox, textbox etc