Changeset 10948

Timestamp:

07/20/2016 05:51:03 PM (8 years ago)

Author:

r-a-y

Message:

XProfile: Do not duplicate populate logic in the BP_XProfile_Field class.

Previously, the $wpdb->get_row() call was duplicated in both the
BP_XProfile_Field::populate() and BP_XProfile_Field::get_instance() DB
methods.

This commit merges the logic into the BP_XProfile_Field::populate()
method and passes existing unit tests.

Fixes #7114.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (2 diffs)

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

@@ -204 +204 @@
         }
 
-        $bp    = buddypress();
-        $field = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id ) );
+        $field = wp_cache_get( $id, 'bp_xprofile_fields' );
+        if ( false === $field ) {
+            $bp = buddypress();
+
+            $field = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id ) );
+
+            if ( ! $field ) {
+                return false;
+            }
+
+            wp_cache_add( $id, $field, 'bp_xprofile_fields' );
+        }
 
         $this->fill_data( $field );
@@ -232 +242 @@
         }
 
-        $field = wp_cache_get( $field_id, 'bp_xprofile_fields' );
-        if ( false === $field ) {
-            $bp = buddypress();
-
-            $field = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
-
-            if ( ! $field ) {
-                return false;
-            }
-
-            wp_cache_add( $field->id, $field, 'bp_xprofile_fields' );
-        }
-
-        $_field = new BP_XProfile_Field();
-        $_field->fill_data( $field );
-
-        return $_field;
+        return new self( $field_id );
     }