Changeset 8645

Timestamp:

07/17/2014 07:59:53 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Clean up brackets, whitespace, and code formatting in bp-xprofile-filters.php. Also remove a rogue unused filter that should have been removed in r3248.

File:

• trunk/src/bp-xprofile/bp-xprofile-filters.php (modified) (8 diffs)

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

@@ -27 +27 @@
 add_filter( 'bp_get_the_profile_field_value',           'esc_html',        8 );
 add_filter( 'bp_get_the_profile_field_value',           'convert_smilies', 9 );
+add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value',         1, 2 );
+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( 'bp_get_the_profile_field_edit_value',      'force_balance_tags' );
@@ -47 +50 @@
 
 add_filter( 'xprofile_get_field_data',                  'stripslashes' );
-
-add_filter( 'bp_get_the_profile_field_value',           'xprofile_filter_format_field_value', 1, 2 );
-add_filter( 'bp_get_the_site_member_profile_data',      'xprofile_filter_format_field_value', 1, 2 );
 add_filter( 'xprofile_get_field_data',                  'xprofile_filter_format_field_value_by_field_id', 5, 2 );
-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_data_value_before_save',          'xprofile_sanitize_data_value_before_save', 1, 2 );
@@ -83 +81 @@
  * @return string
  */
-function xprofile_sanitize_data_value_before_save ( $field_value, $field_id, $reserialize = true ) {
+function xprofile_sanitize_data_value_before_save( $field_value, $field_id = 0, $reserialize = true ) {
 
     // Return if empty
@@ -109 +107 @@
         }
 
-        if ( !empty( $reserialize ) )
+        if ( !empty( $reserialize ) ) {
             $filtered_field_value = serialize( $filtered_values );
-        else
+        } else {
             $filtered_field_value = $filtered_values;
+        }
     }
 
@@ -128 +127 @@
  */
 function xprofile_filter_format_field_value( $field_value, $field_type = '' ) {
+
     // Valid field values of 0 or '0' get caught by empty(), so we have an extra check for these. See #BP5731
-    if ( ! isset( $field_value ) || empty( $field_value ) && '0' != $field_value )
+    if ( ! isset( $field_value ) || empty( $field_value ) && ( '0' !== $field_value ) ) {
         return false;
-
-    if ( 'datebox' != $field_type ) {
-        $field_value = str_replace(']]>', ']]>', $field_value );
+    }
+
+    if ( 'datebox' !== $field_type ) {
+        $field_value = str_replace( ']]>', ']]>', $field_value );
     }
 
@@ -176 +177 @@
 
 function xprofile_filter_link_profile_data( $field_value, $field_type = 'textbox' ) {
-    if ( 'datebox' == $field_type )
+
+    if ( 'datebox' === $field_type ) {
         return $field_value;
-
-    if ( !strpos( $field_value, ',' ) && ( count( explode( ' ', $field_value ) ) > 5 ) )
+    }
+
+    if ( !strpos( $field_value, ',' ) && ( count( explode( ' ', $field_value ) ) > 5 ) ) {
         return $field_value;
+    }
 
     $values = explode( ',', $field_value );
@@ -223 +227 @@
  * @return array $comments
  */
-function xprofile_filter_comments( $comments, $post_id ) {
+function xprofile_filter_comments( $comments, $post_id = 0 ) {
+
     // Locate comment authors with WP accounts
     foreach( (array) $comments as $comment ) {
@@ -261 +266 @@
  * @since BuddyPress (1.7)
  *
- * @global BuddyPress $bp
- * @global WPDB $wpdb
  * @param BP_User_Query $user_query
  * @param string $user_ids_sql
  */
-function bp_xprofile_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql ) {
-    global $bp, $wpdb;
+function bp_xprofile_filter_user_query_populate_extras( BP_User_Query $user_query, $user_ids_sql = '' ) {
 
     if ( ! bp_is_active( 'xprofile' ) ) {