Changeset 9675 for trunk/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php

Timestamp:

04/01/2015 10:29:02 PM (11 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Code formatting cleanup to BP_XProfile_ProfileData.

Also updates an unused & long since deprecated function to maybe actually return correct results.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-profiledata.php (modified) (6 diffs)

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

@@ -144 +144 @@
                         }
 
-                        if ( false === $result )
+                        if ( false === $result ) {
                                 return false;
+                        }
 
                         /**
@@ -182 +183 @@
                 do_action_ref_array( 'xprofile_data_before_delete', array( $this ) );
 
-                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ) ) )
+                $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ) );
+                if ( empty( $deleted ) ) {
                         return false;
+                }
 
                 /**
@@ -423 +426 @@
                 global $wpdb;
 
-                if ( empty( $fields ) )
+                if ( empty( $fields ) ) {
                         return false;
-
-                $bp = buddypress();
-
-                if ( empty( $user_id ) )
+                }
+
+                $bp = buddypress();
+
+                if ( empty( $user_id ) ) {
                         $user_id = bp_displayed_user_id();
+                }
 
                 $field_sql = '';
@@ -447 +452 @@
                 }
 
-                $sql = $wpdb->prepare( "SELECT d.value, f.name FROM {$bp->profile->table_name_data} d, {$bp->profile->table_name_fields} f WHERE d.field_id = f.id AND d.user_id = %d AND f.parent_id = 0 $field_sql", $user_id );
-
-                if ( !$values = $wpdb->get_results( $sql ) )
+                $sql    = $wpdb->prepare( "SELECT d.value, f.name FROM {$bp->profile->table_name_data} d, {$bp->profile->table_name_fields} f WHERE d.field_id = f.id AND d.user_id = %d AND f.parent_id = 0 $field_sql", $user_id );
+                $values = $wpdb->get_results( $sql );
+
+                if ( empty( $values ) || is_wp_error( $values ) ) {
                         return false;
+                }
 
                 $new_values = array();
@@ -474 +481 @@
                 global $wpdb;
 
-                $bp = buddypress();
-
-                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id ) ) )
+                $bp      = buddypress();
+                $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id ) );
+                if ( empty( $deleted ) || is_wp_error( $deleted ) ) {
                         return false;
+                }
 
                 return true;
@@ -512 +520 @@
         public static function get_fullname( $user_id = 0 ) {
 
-                if ( empty( $user_id ) )
+                if ( empty( $user_id ) ) {
                         $user_id = bp_displayed_user_id();
-
-                $data = xprofile_get_field_data( bp_xprofile_fullname_field_id(), $user_id );
-
-                return $data[$field_name];
+                }
+
+                return xprofile_get_field_data( bp_xprofile_fullname_field_id(), $user_id );
         }
 }