Changeset 8811

Timestamp:

08/12/2014 01:19:41 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add brackets to some functions in bp-xprofile-functions.php.

File:

• trunk/src/bp-xprofile/bp-xprofile-functions.php (modified) (4 diffs)

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

@@ -489 +489 @@
 }
 
-function xprofile_delete_field_data( $field, $user_id ) {
-        if ( is_numeric( $field ) )
-                $field_id = $field;
-        else
+function xprofile_delete_field_data( $field = '', $user_id = 0 ) {
+
+        // Get the field ID
+        if ( is_numeric( $field ) ) {
+                $field_id = (int) $field;
+        } else {
                 $field_id = xprofile_get_field_id_from_name( $field );
-
-        if ( empty( $field_id ) || empty( $user_id ) )
-                return false;
-
+        }
+
+        // Bail if field or user ID are empty
+        if ( empty( $field_id ) || empty( $user_id ) ) {
+                return false;
+        }
+
+        // Get the profile field data to delete
         $field = new BP_XProfile_ProfileData( $field_id, $user_id );
+
+        // Delete the field data
         return $field->delete();
 }
@@ -509 +517 @@
 
         // Super admins can skip required check
-        if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() )
+        if ( bp_current_user_can( 'bp_moderate' ) && ! is_admin() ) {
                 $retval = false;
 
         // All other users will use the field's setting
-        elseif ( isset( $field->is_required ) )
+        } elseif ( isset( $field->is_required ) ) {
                 $retval = $field->is_required;
+        }
 
         return (bool) $retval;
@@ -545 +554 @@
         $field_data = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
 
-        if ( empty( $field_data ) )
-                return false;
+        if ( empty( $field_data ) ) {
+                return false;
+        }
 
         $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
 
-        if ( empty( $field_data[0]->value ) )
-                return false;
+        if ( empty( $field_data[0]->value ) ) {
+                return false;
+        }
 
         return apply_filters( 'xprofile_get_random_profile_data', $field_data );
@@ -565 +576 @@
  */
 function xprofile_format_profile_field( $field_type, $field_value ) {
-        if ( !isset( $field_value ) || empty( $field_value ) )
-                return false;
+
+        if ( empty( $field_value ) ) {
+                return false;
+        }
 
         $field_value = bp_unserialize_profile_field( $field_value );