Changeset 13797

Timestamp:

04/20/2024 06:48:57 PM (2 years ago)

Author:

espellcaste

Message:

While pulling XProfile group fields objects from cache with the BP_XProfile_Group::get method,
avoid unnecessary queries for the cached bp_xprofile_get_signup_field_ids() function.

See #8976

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-admin.php (modified) (1 diff)
• src/bp-xprofile/classes/class-bp-xprofile-group.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/template.php (modified) (5 diffs)

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

@@ -349 +349 @@
                                                                                  * display for the xprofile admin setup screen.
                                                                                  */
-                                                                                $signup_fields[ $_signup_field->id ] = bp_xprofile_admin_get_signup_field( $_signup_field, $signup_group, '' );
+                                                                                $signup_fields[ $_signup_field->id ] = bp_xprofile_admin_get_signup_field( $_signup_field, $signup_group );
                                                                         }
                                                                 }

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

@@ -347 +347 @@
                 }
 
+                $signup_fields_order = bp_xprofile_get_signup_field_ids();
+
                 // Pull field objects from the cache.
                 $fields = array();
                 foreach ( $field_ids as $field_id ) {
-                        if ( true === $r['signup_fields_only'] && ! in_array( $field_id, bp_xprofile_get_signup_field_ids(), true ) ) {
+                        if ( true === $r['signup_fields_only'] && ! in_array( $field_id, $signup_fields_order, true ) ) {
                                 continue;
                         }

trunk/tests/phpunit/testcases/xprofile/template.php

@@ -94 +94 @@
                         array(
                                 'field_group_id' => $group_1,
-                                'type' => 'textbox',
-                                'name' => 'InSignupForm1'
+                                'type'           => 'textbox',
+                                'name'           => 'InSignupForm1'
                         )
                 );
@@ -105 +105 @@
                         array(
                                 'field_group_id' => $group_2,
-                                'type' => 'textbox',
-                                'name' => 'InSignupForm2'
+                                'type'           => 'textbox',
+                                'name'           => 'InSignupForm2'
                         )
                 );
@@ -121 +121 @@
                 $this->assertSame( $expected_names, $names );
 
+                // Confirm the fields are in the right order.
+                $this->assertSame( 'InSignupForm2', $group->fields[1]->name );
+                $this->assertSame( 'InSignupForm1', $group->fields[2]->name );
+
                 xprofile_delete_field_group( $group_1 );
                 xprofile_delete_field_group( $group_2 );
@@ -139 +143 @@
                 $g3 = self::factory()->xprofile_group->create();
 
-                $field_in_1 = self::factory()->xprofile_field->create(
+                self::factory()->xprofile_field->create(
                         [
                                 'field_group_id' => $g1,
@@ -147 +151 @@
                 );
 
-                $field_in_2 = self::factory()->xprofile_field->create(
+                self::factory()->xprofile_field->create(
                         [
                                 'field_group_id' => $g2,