Ticket #5742: 5742.patch

bp-xprofile/bp-xprofile-classes.php

@@ -1097 +1097 @@
 
                 $this->user_id      = apply_filters( 'xprofile_data_user_id_before_save',      $this->user_id,         $this->id );
                 $this->field_id     = apply_filters( 'xprofile_data_field_id_before_save',     $this->field_id,        $this->id );
-                $this->value        = apply_filters( 'xprofile_data_value_before_save',        $this->value,           $this->id );
+                $this->value        = apply_filters( 'xprofile_data_value_before_save',        $this->value,           $this->field_id );
                 $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', bp_core_current_time(), $this->id );
 
                 do_action_ref_array( 'xprofile_data_before_save', array( $this ) );

bp-xprofile/bp-xprofile-filters.php

@@ -62 +62 @@
  * Run profile field values through kses with filterable allowed tags.
  *
  * @param string $content
+ * @param int $field_id
  * @return string $content
  */
-function xprofile_filter_kses( $content ) {
+function xprofile_filter_kses( $content, $field_id = null ) {
         global $allowedtags;
 
         $xprofile_allowedtags             = $allowedtags;
         $xprofile_allowedtags['a']['rel'] = array();
 
-        $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags );
+        $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags, $field_id );
         return wp_kses( $content, $xprofile_allowedtags );
 }
 
@@ -94 +95 @@
 
         // Filter single value
         if ( !is_array( $field_value ) ) {
-                $kses_field_value     = xprofile_filter_kses( $field_value );
+                $kses_field_value     = xprofile_filter_kses( $field_value, $field_id );
                 $filtered_field_value = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
-                $filtered_field_value = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_field_value, $field_value );
+                $filtered_field_value = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_field_value, $field_value, $field_id );
 
         // Filter each array item independently
         } else {
                 $filtered_values = array();
                 foreach ( (array) $field_value as $value ) {
-                        $kses_field_value       = xprofile_filter_kses( $value );
+                        $kses_field_value       = xprofile_filter_kses( $value, $field_id );
                         $filtered_value         = wp_rel_nofollow( force_balance_tags( $kses_field_value ) );
-                        $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value );
+                        $filtered_values[] = apply_filters( 'xprofile_filtered_data_value_before_save', $filtered_value, $value, $field_id );
 
                 }