Ticket #2603: pgibbs3.patch

bp-xprofile/bp-xprofile-filters.php

@@ -8 +8 @@
 add_filter( 'xprofile_get_field_data', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_field_name_before_save', 'wp_filter_kses', 1 );
 add_filter( 'xprofile_field_description_before_save', 'wp_filter_kses', 1 );
+add_filter( 'xprofile_filter_format_field_data', 'wp_filter_kses', 1 ); 
 
 add_filter( 'bp_get_the_profile_field_edit_value', 'wp_filter_kses', 1 );
 add_filter( 'bp_get_the_profile_field_description', 'wp_filter_kses', 1 );
 
 add_filter( 'xprofile_field_name_before_save', 'force_balance_tags' );
 add_filter( 'xprofile_field_description_before_save', 'force_balance_tags' );
+add_filter( 'xprofile_filter_format_field_data', 'force_balance_tags' );
 
 add_filter( 'bp_get_the_profile_field_value', 'wptexturize' );
 add_filter( 'bp_get_the_profile_field_value', 'convert_smilies', 2 );
@@ -41 +43 @@
 
 /* Custom BuddyPress filters */
 
+/**
+ * xprofile_filter_format_field_data()
+ *
+ * Sanitises xprofile field data.
+ *
+ * @package BuddyPress xProfile
+ * @param string $value The new field value
+ * @param int $id ID for bp_xprofile_data record. May be zero if this is a new record.
+ * @param BP_XProfile_ProfileData $profiledata Current xProfile field data class.
+ * @return string|array
+ */
+function xprofile_filter_format_field_data( $value, $id, $profiledata ) {
+        if ( !$field = new BP_XProfile_Field( $profiledata->field_id ) )
+                return $value;
+
+        switch ( $field->type ) {
+                case 'textbox':
+                case 'textarea':
+                        $value = apply_filters( 'xprofile_filter_format_field_data', $value, $id );
+                break;
+
+                case 'checkbox':
+                case 'selectbox':
+                case 'multiselectbox':
+                case 'radio':
+                        if ( !is_array( $value ) )
+                                break;
+
+                        foreach ( $value as $v ) {
+                                $v = apply_filters( 'xprofile_filter_format_field_data', $v, $id );
+                        }
+                break;
+        }
+
+        return $value;
+}
+add_filter( 'xprofile_data_value_before_save', 'xprofile_filter_format_field_data', 10, 3 );
+
 function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
         if ( !isset($field_value) || empty( $field_value ) )
                 return false;

bp-xprofile/bp-xprofile-classes.php

@@ -719 +719 @@
         function save() {
                 global $wpdb, $bp;
 
-                $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->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', date( 'Y-m-d H:i:s' ), $this->id );
+                $this->user_id = apply_filters( 'xprofile_data_user_id_before_save', $this->user_id, $this->id, $this );
+                $this->field_id = apply_filters( 'xprofile_data_field_id_before_save', $this->field_id, $this->id, $this );
+                $this->value = apply_filters( 'xprofile_data_value_before_save', $this->value, $this->id, $this );
+                $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', date( 'Y-m-d H:i:s' ), $this->id, $this );
 
                 do_action( 'xprofile_data_before_save', $this );