Changeset 6470 for trunk/bp-core/bp-core-classes.php

Timestamp:

10/29/2012 01:11:04 PM (14 years ago)

Author:

boonebgorges

Message:

Modifications to BP_User_Query to make member searches work correctly

• Don't pass invalid function parameter when doing user_id search. Props DJPaul
• Introduce $no_results property (borrowed from WP_Tax_Query)
• When a member search returns no results, ensure that the user query also returns no results

See #4060

File:

• trunk/bp-core/bp-core-classes.php (modified) (3 diffs)

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

@@ -100 +100 @@
         public $uid_name = '';
 
+        /**
+         * Standard response when the query should not return any rows.
+         *
+         * @since BuddyPress (1.7)
+         * @access protected
+         * @var string
+         */
+        protected $no_results = array( 'join' => '', 'where' => '0 = 1' );
+
+
         /** Methods ***************************************************************/
 
@@ -286 +296 @@
                         } else {
                                 // If the user has no friends, make sure the query returns null
-                                $sql['where'][] = "0 = 1";
+                                $sql['where'][] = $this->no_results['where'];
                         }
                 }
@@ -296 +306 @@
                 // @todo remove need for bp_is_active() check
                 if ( false !== $search_terms && bp_is_active( 'xprofile' ) ) {
-                        $found_user_ids = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE %s", '%%' . like_escape( $search_terms ) . '%%' ), ARRAY_N );
+                        $found_user_ids = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE %s", '%%' . like_escape( $search_terms ) . '%%' ) );
 
                         if ( ! empty( $found_user_ids ) ) {
                                 $sql['where'][] = "u.{$this->uid_name} IN (" . implode( ',', wp_parse_id_list( $found_user_ids ) ) . ")";
+                        } else {
+                                $sql['where'][] = $this->no_results['where'];
                         }
                 }