Changeset 13528

Timestamp:

07/27/2023 10:46:04 AM (2 years ago)

Author:

imath

Message:

Prevent potential errors in bp_get_the_profile_field_ids()

In case this function is used inside an xProfile group loop having no attached profile fields, instead of generating a notice error, let's simply return an empty string.

Props shawfactor

Fixes #8789
Closes ​https://github.com/buddypress/buddypress/pull/140

Location:

trunk

Files:

• src/bp-xprofile/bp-xprofile-template.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/template.php (modified) (1 diff)

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

@@ -474 +474 @@
 
         $field_ids = array();
-        foreach ( $profile_template->groups as $group ) {
-            if ( ! empty( $group->fields ) ) {
-                $field_ids = array_merge( $field_ids, wp_list_pluck( $group->fields, 'id' ) );
+
+        if ( isset( $profile_template->groups ) && $profile_template->groups ) {
+            foreach ( $profile_template->groups as $group ) {
+                if ( ! empty( $group->fields ) ) {
+                    $field_ids = array_merge( $field_ids, wp_list_pluck( $group->fields, 'id' ) );
+                }
             }
-        }
-
-        $field_ids = implode( ',', wp_parse_id_list( $field_ids ) );
+
+            $field_ids = implode( ',', wp_parse_id_list( $field_ids ) );
+        } else {
+            $field_ids = '';
+        }
 
         /**

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

@@ -178 +178 @@
         $profile_template = $reset_profile_template;
     }
+
+    /**
+     * @group bp_get_the_profile_field_ids
+     * @group bp_has_profile
+     */
+    public function test_bp_get_the_profile_field_ids() {
+        global $profile_template;
+        $reset_profile_template = $profile_template;
+
+        $group     = self::factory()->xprofile_group->create();
+        $fields_in = array(
+            self::factory()->xprofile_field->create(
+                array(
+                    'field_group_id' => $group,
+                )
+            ),
+            self::factory()->xprofile_field->create(
+                array(
+                    'field_group_id' => $group,
+                )
+            )
+        );
+
+        bp_has_profile( array( 'profile_group_id' => $group ) );
+        $this->assertSame( bp_get_the_profile_field_ids(), implode( ',', $fields_in ) );
+
+        foreach ( $fields_in as $field_in_id ) {
+            xprofile_delete_field( $field_in_id );
+        }
+
+        xprofile_delete_field_group( $group );
+
+        $profile_template = $reset_profile_template;
+    }
+
+    /**
+     * @group bp_get_the_profile_field_ids
+     */
+    public function test_bp_get_the_profile_field_ids_no_group() {
+        global $profile_template;
+        $reset_profile_template = $profile_template;
+
+        $profile_template = new stdClass();
+
+        $this->assertEquals( '', bp_get_the_profile_field_ids() );
+
+        $profile_template->groups = array();
+
+        $this->assertEquals( '', bp_get_the_profile_field_ids() );
+
+        $profile_template = $reset_profile_template;
+    }
 }