Changeset 9654

Timestamp:

03/28/2015 03:28:05 PM (11 years ago)

Author:

boonebgorges

Message:

Avoid PHP notices when calling groups_delete_groupmeta() on group with no metadata.

Fixes #6326.

Location:

trunk

Files:

• src/bp-groups/bp-groups-functions.php (modified) (1 diff)
• tests/phpunit/testcases/groups/functions.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-functions.php

@@ -1651 +1651 @@
         add_filter( 'query', 'bp_filter_metaid_column_name' );
 
+        $retval = true;
         foreach ( $keys as $key ) {
                 $retval = delete_metadata( 'group', $group_id, $key, $meta_value, $delete_all );

trunk/tests/phpunit/testcases/groups/functions.php

@@ -519 +519 @@
          * @group groupmeta
          * @group groups_delete_groupmeta
+         * @ticket BP6326
+         */
+        public function test_groups_delete_groupmeta_with_no_meta_key_when_group_has_metadata() {
+                global $wpdb;
+
+                $g = $this->factory->group->create();
+                $m = groups_get_groupmeta( $g );
+                foreach ( $m as $mk => $mv ) {
+                        groups_delete_groupmeta( $g, $mk );
+                }
+
+                $found = groups_delete_groupmeta( $g );
+                $this->assertTrue( $found );
+        }
+
+        /**
+         * @group groupmeta
+         * @group groups_delete_groupmeta
          */
         public function test_groups_delete_groupmeta_with_delete_all_but_no_meta_key() {