Changeset 12211 for branches/3.0

Timestamp:

08/31/2018 06:43:30 PM (8 years ago)

Author:

boonebgorges

Message:

Prevent notices on PHP 7.2 when deleting xprofile groups.

Merges [12210] to the 3.0 branch.

Fixes #7916.

Location:

branches/3.0

Files:

• . (modified) (1 prop)
• src/bp-xprofile/classes/class-bp-xprofile-group.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php (modified) (1 diff)

branches/3.0/src/bp-xprofile/classes/class-bp-xprofile-group.php

@@ -212 +212 @@
 
                         // Remove profile data for the groups fields.
-                        for ( $i = 0, $count = count( $this->fields ); $i < $count; ++$i ) {
-                                BP_XProfile_ProfileData::delete_for_field( $this->fields[$i]->id );
+                        if ( ! empty( $this->fields ) ) {
+                                for ( $i = 0, $count = count( $this->fields ); $i < $count; ++$i ) {
+                                        BP_XProfile_ProfileData::delete_for_field( $this->fields[$i]->id );
+                                }
                         }
                 }

branches/3.0/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php

@@ -17 +17 @@
 
                 $this->assertEquals( $g, $saved );
+        }
+
+        /**
+         * @ticket BP7916
+         */
+        public function test_delete() {
+                $g = self::factory()->xprofile_group->create();
+
+                $groups    = bp_xprofile_get_groups();
+                $group_ids = wp_list_pluck( $groups, 'id' );
+                $this->assertContains( $g, $group_ids );
+
+                $group = new BP_XProfile_Group( $g );
+                $this->assertTrue( $group->delete() );
+
+                $groups    = bp_xprofile_get_groups();
+                $group_ids = wp_list_pluck( $groups, 'id' );
+                $this->assertNotContains( $g, $group_ids );
         }