Changeset 9985

Timestamp:

07/02/2015 12:54:28 PM (9 years ago)

Author:

boonebgorges

Message:

Fix SQL syntax error in BP_Friends_Friendship::search_friends().

Props rittesh.patel.
Fixes #6546.

Location:

trunk

Files:

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

trunk/src/bp-friends/classes/class-bp-friends-friendship.php

@@ -343 +343 @@
             $total_sql = $wpdb->prepare( "SELECT COUNT(DISTINCT user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ({$fids}) AND value LIKE %s", $search_terms_like );
         } else {
-            $sql       = $wpdb->prepare( "SELECT DISTINCT user_id FROM {$wpdb->usermeta} WHERE user_id IN ({$fids}) AND meta_key = 'nickname' AND meta_value LIKE %s' {$pag_sql}", $search_terms_like );
+            $sql       = $wpdb->prepare( "SELECT DISTINCT user_id FROM {$wpdb->usermeta} WHERE user_id IN ({$fids}) AND meta_key = 'nickname' AND meta_value LIKE %s {$pag_sql}", $search_terms_like );
             $total_sql = $wpdb->prepare( "SELECT COUNT(DISTINCT user_id) FROM {$wpdb->usermeta} WHERE user_id IN ({$fids}) AND meta_key = 'nickname' AND meta_value LIKE %s", $search_terms_like );
         }

trunk/tests/phpunit/testcases/friends/class-bp-friends-friendship.php

@@ -12 +12 @@
         xprofile_set_field_data( 1, $u2, 'Cool Dude' );
         xprofile_set_field_data( 1, $u3, 'Rock And Roll America Yeah' );
+
+        friends_add_friend( $u1, $u2, true );
+        friends_add_friend( $u1, $u3, true );
+
+        $friends = BP_Friends_Friendship::search_friends( 'Coo', $u1 );
+        $this->assertEquals( array( $u2 ), $friends['friends'] );
+    }
+
+    /**
+     * @ticket BP6546
+     */
+    public function test_search_friends_with_xprofile_inactive() {
+        $this->deactivate_component( 'xprofile' );
+
+        $u1 = $this->factory->user->create();
+        $u2 = $this->factory->user->create();
+        $u3 = $this->factory->user->create();
+
+        add_user_meta( $u2, 'nickname', 'Cool Dude' );
+        add_user_meta( $u3, 'nickname', 'Rock And Roll America Yeah' );
 
         friends_add_friend( $u1, $u2, true );