Changeset 8430

Timestamp:

05/19/2014 07:28:36 PM (12 years ago)

Author:

boonebgorges

Message:

Correct query concatenation for exclude_groups param in BP_XProfile_Group::get()

The previous format was not working properly when passing multiple group ids.

Fixes #5649

Props imath

Location:

trunk

Files:

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

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

@@ -151 +151 @@
                 $where_sql = '';
 
-                if ( !empty( $profile_group_id ) )
+                if ( ! empty( $profile_group_id ) ) {
                         $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
-                elseif ( $exclude_groups )
-                        $where_sql = $wpdb->prepare( "WHERE g.id NOT IN ({$exclude_groups})");
+                } else if ( $exclude_groups ) {
+                        $exclude_groups = join( ',', wp_parse_id_list( $exclude_groups ) );
+                        $where_sql = "WHERE g.id NOT IN ({$exclude_groups})";
+                }
 
                 if ( ! empty( $hide_empty_groups ) ) {

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php

@@ -68 +68 @@
                 $this->assertSame( $expected, $found );
         }
+
+        /**
+         * @group get_xprofile_groups
+         */
+        public function test_get_xprofile_groups() {
+                $g1 = $this->factory->xprofile_group->create();
+                $g2 = $this->factory->xprofile_group->create();
+                $g3 = $this->factory->xprofile_group->create();
+
+                $all = BP_XProfile_Group::get();
+                $all_results = array_map( 'absint', wp_list_pluck( $all, 'id' ) );
+
+                $e1 = array( $g1, $g2 );
+                $groups1 = BP_XProfile_Group::get( array(
+                        'exclude_groups' => implode( ',', $e1 ),
+                ) );
+
+                $r_groups1 = array_map( 'absint', wp_list_pluck( $groups1, 'id' ) );
+                $found1 = array_diff( $all_results, $r_groups1 );
+
+                $this->assertSame( $e1, array_merge( $found1, array() ) );
+
+                $e2 = array( $g2, $g3 );
+                $groups2 = BP_XProfile_Group::get( array(
+                        'exclude_groups' => $e2,
+                ) );
+
+                $r_groups2 = array_map( 'absint', wp_list_pluck( $groups2, 'id' ) );
+                $found2 = array_diff( $all_results, $r_groups2 );
+
+                $this->assertSame( $e2, array_merge( $found2, array() ) );
+        }
 }