Changeset 8665

Timestamp:

07/22/2014 08:24:39 PM (11 years ago)

Author:

djpaul

Message:

xProfile: add extra arguments to xprofile_data_value_before_save and xprofile_filtered_data_value_before_save filters.

This allows plugin developers greater control over filtering profile data in specific circumstances, particularly for custom field types.

Fixes #5742, props needle.

Location:

trunk/src/bp-xprofile

Files:

• bp-xprofile-classes.php (modified) (1 diff)
• bp-xprofile-filters.php (modified) (6 diffs)

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -1098 +1098 @@
         $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->id, true, $this );
         $this->last_updated = apply_filters( 'xprofile_data_last_updated_before_save', bp_core_current_time(), $this->id );
 

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

@@ -52 +52 @@
 add_filter( 'xprofile_get_field_data',                  'xprofile_filter_format_field_value_by_field_id', 5, 2 );
 
-add_filter( 'xprofile_data_value_before_save',          'xprofile_sanitize_data_value_before_save', 1, 2 );
+add_filter( 'xprofile_data_value_before_save',          'xprofile_sanitize_data_value_before_save', 1, 4 );
 add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
 
@@ -61 +61 @@
  *
  * @param string $content
+ * @param object $data_obj The BP_XProfile_ProfileData object
  * @return string $content
  */
-function xprofile_filter_kses( $content ) {
+function xprofile_filter_kses( $content, $data_obj = null ) {
     global $allowedtags;
 
@@ -69 +70 @@
     $xprofile_allowedtags['a']['rel'] = array();
 
-    $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags );
+    $xprofile_allowedtags = apply_filters( 'xprofile_allowed_tags', $xprofile_allowedtags, $data_obj );
     return wp_kses( $content, $xprofile_allowedtags );
 }
@@ -79 +80 @@
  * @param int $field_id
  * @param bool $reserialize Whether to reserialize arrays before returning. Defaults to true
+ * @param object $data_obj The BP_XProfile_ProfileData object
  * @return string
  */
-function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true ) {
+function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true, $data_obj = null ) {
 
     // Return if empty
@@ -93 +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, $data_obj );
         $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, $data_obj );
 
     // Filter each array item independently
@@ -101 +103 @@
         $filtered_values = array();
         foreach ( (array) $field_value as $value ) {
-            $kses_field_value       = xprofile_filter_kses( $value );
+            $kses_field_value       = xprofile_filter_kses( $value, $data_obj );
             $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, $data_obj );
 
         }