Changeset 12866

Timestamp:

03/17/2021 08:35:54 PM (4 years ago)

Author:

dcavins

Message:

BP_Invitation: Improve search_terms support for useful columns.

Instead of searching the class column, which would potentially return
surprising results, search the invitee_email and content columns.

Fixes #8443.

Location:

trunk

Files:

• src/bp-core/classes/class-bp-invitation.php (modified) (2 diffs)
• tests/phpunit/testcases/core/invitations.php (modified) (2 diffs)

trunk/src/bp-core/classes/class-bp-invitation.php

@@ -423 +423 @@
          * Only create a where statement if something less than "all" has been
          * specifically requested.
-         */ 
+         */
         if ( ! empty( $args['invite_sent'] ) && 'all' !== $args['invite_sent'] ) {
             if ( $args['invite_sent'] == 'draft' ) {
@@ -444 +444 @@
         if ( ! empty( $args['search_terms'] ) ) {
             $search_terms_like = '%' . bp_esc_like( $args['search_terms'] ) . '%';
-            $where_conditions['search_terms'] = $wpdb->prepare( "( class LIKE %s )", $search_terms_like, $search_terms_like );
+            $where_conditions['search_terms'] = $wpdb->prepare( '( invitee_email LIKE %s OR content LIKE %s )', $search_terms_like, $search_terms_like );
         }
 

trunk/tests/phpunit/testcases/core/invitations.php

@@ -174 +174 @@
         $this->set_current_user( $old_current_user );
     }
-    
+
     public function test_bp_invitations_add_request_vanilla() {
         $old_current_user = get_current_user_id();
@@ -288 +288 @@
     }
 
+    public function test_bp_invitations_get_by_search_terms() {
+        $old_current_user = get_current_user_id();
+
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+        $this->set_current_user( $u1 );
+
+        $invites_class = new BPTest_Invitation_Manager_Extension();
+
+        // Create an invitation.
+        $i1_args = array(
+            'user_id'    => $u2,
+            'inviter_id' => $u1,
+            'item_id'    => 1,
+            'content'    => 'Sometimes, the mystery is enough.',
+        );
+        $i1 = $invites_class->add_invitation( $i1_args );
+        $invites_class->send_invitation_by_id( $i1 );
+
+        // Create an invitation that uses an email address.
+        $i2_args = array(
+            'invitee_email' => 'findme@buddypress.org',
+            'inviter_id'    => $u1,
+            'item_id'       => 1,
+        );
+        $i2 = $invites_class->add_invitation( $i2_args );
+        $invites_class->send_invitation_by_id( $i2 );
+
+        $get_invites = array(
+            'search_terms' => 'mystery',
+            'fields'       => 'ids',
+        );
+        $invites = $invites_class->get_invitations( $get_invites );
+        $this->assertEqualSets( array( $i1 ), $invites );
+
+        $get_invites = array(
+            'search_terms' => 'findme',
+            'fields'       => 'ids',
+        );
+        $invites = $invites_class->get_invitations( $get_invites );
+        $this->assertEqualSets( array( $i2 ), $invites );
+
+        $this->set_current_user( $old_current_user );
+    }
+
 }