Changeset 8753

Timestamp:

08/03/2014 08:51:44 PM (12 years ago)

Author:

djpaul

Message:

Core: adjust the SQL generated by BP_User_Query's search_wildcard parameter for better Suggestions API search results.

Introduced in r8675, the search_wildcard parameter controls where BuddyPress places MySQL wildcard characters around the search term (when it's set).

This change adjusts how the wildcard SQL is constructed; in addition to the wildcard, we now also check for matches that have a single space character at the opposite end of the string (from where the wildcard is). This allows searching data that looks like (for example) a surname in a combined first name/surname field.
e.g. if a displayname is "Paul Gibbs", you can search for "Gi", and with search_wildcard=right, the SQL generated will be LIKE 'Gi%' OR LIKE '% Gi%'.

See #3278

Location:

trunk/src

Files:

• bp-core/bp-core-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-functions.php (modified) (1 diff)

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

@@ -369 +369 @@
                 // xprofile field matches happen in bp_xprofile_bp_user_query_search()
                 if ( false !== $search_terms ) {
-                        $search_terms_like = bp_esc_like( $search_terms );
+                        $search_terms = bp_esc_like( $search_terms );
 
                         if ( $search_wildcard === 'left' ) {
-                                $search_terms_like = '%' . $search_terms_like;
+                                $search_terms_nospace = '%' . $search_terms;
+                                $search_terms_space   = '%' . $search_terms . ' %';
                         } elseif ( $search_wildcard === 'right' ) {
-                                $search_terms_like = $search_terms_like . '%';
+                                $search_terms_nospace =        $search_terms . '%';
+                                $search_terms_space   = '% ' . $search_terms . '%';
                         } else {
-                                $search_terms_like = '%' . $search_terms_like . '%';
-                        }
-
-                        $sql['where']['search'] = $wpdb->prepare( "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE ( user_login LIKE %s OR user_nicename LIKE %s ) )", $search_terms_like, $search_terms_like );
+                                $search_terms_nospace = '%' . $search_terms . '%';
+                                $search_terms_space   = '%' . $search_terms . '%';
+                        }
+
+                        $sql['where']['search'] = $wpdb->prepare(
+                                "u.{$this->uid_name} IN ( SELECT ID FROM {$wpdb->users} WHERE ( user_login LIKE %s OR user_login LIKE %s OR user_nicename LIKE %s OR user_nicename LIKE %s ) )",
+                                $search_terms_nospace,
+                                $search_terms_space,
+                                $search_terms_nospace,
+                                $search_terms_space
+                        );
                 }
 
@@ -2567 +2576 @@
          */
         protected $default_args = array(
-                'limit'        => 16,
+                'limit'        => 10,
                 'only_friends' => false,
                 'term'         => '',
@@ -2607 +2616 @@
                         'per_page'        => $this->args['limit'],
                         'search_terms'    => $this->args['term'],
+                        'search_wildcard' => is_rtl() ? 'left' : 'right',
                 );
 

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

@@ -4388 +4388 @@
                         'per_page'        => $this->args['limit'],
                         'search_terms'    => $this->args['term'],
+                        'search_wildcard' => 'right',
                 );
 

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

@@ -591 +591 @@
         $bp = buddypress();
 
-        $search_terms_clean = esc_sql( esc_sql( $query->query_vars['search_terms'] ) );
+        $search_terms_clean = bp_esc_like( $query->query_vars['search_terms'] );
 
         if ( $query->query_vars['search_wildcard'] === 'left' ) {
-                $search_terms_clean = '%' . $search_terms_clean;
+                $search_terms_nospace = '%' . $search_terms_clean;
+                $search_terms_space   = '%' . $search_terms_clean . ' %';
         } elseif ( $query->query_vars['search_wildcard'] === 'right' ) {
-                $search_terms_clean = $search_terms_clean . '%';
+                $search_terms_nospace =        $search_terms_clean . '%';
+                $search_terms_space   = '% ' . $search_terms_clean . '%';
         } else {
-                $search_terms_clean = '%' . $search_terms_clean . '%';
+                $search_terms_nospace = '%' . $search_terms_clean . '%';
+                $search_terms_space   = '%' . $search_terms_clean . '%';
         }
 
         // Combine the core search (against wp_users) into a single OR clause
         // with the xprofile_data search
+        $search_xprofile = $wpdb->prepare(
+                "u.{$query->uid_name} IN ( SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE %s OR value LIKE %s )",
+                $search_terms_nospace,
+                $search_terms_space
+        );
+
         $search_core     = $sql['where']['search'];
-        $search_xprofile = "u.{$query->uid_name} IN ( SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE '{$search_terms_clean}' )";
         $search_combined = "( {$search_xprofile} OR {$search_core} )";
-
         $sql['where']['search'] = $search_combined;