Changeset 2951

Timestamp:

04/24/2010 05:14:47 PM (16 years ago)

Author:

apeatling

Message:

User join filters.

Location:

trunk

Files:

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

trunk/bp-activity/bp-activity-classes.php

@@ -131 +131 @@
                 if ( $per_page && $page ) {
                         $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
-                        $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
+                        $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}", $select_sql, $from_sql, $where_sql, $sort, $pag_sql ) ) );
                 } else
-                        $activities = $wpdb->get_results( $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort} {$pag_sql}" ) );
+                        $activities = $wpdb->get_results( apply_filters( 'bp_activity_get_user_join_filter', $wpdb->prepare( "{$select_sql} {$from_sql} {$where_sql} ORDER BY a.date_recorded {$sort}", $select_sql, $from_sql, $where_sql, $sort ) ) );
 
                 $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(a.id) FROM {$bp->activity->table_name} a {$where_sql} ORDER BY a.date_recorded {$sort}" ) );
@@ -367 +367 @@
 
                         /* Retrieve all descendants of the $root node */
-                        $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ) );
+                        $descendants = $wpdb->get_results( apply_filters( 'bp_activity_comments_user_join_filter', $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.type = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ), $activity_id, $left, $right ) );
 
                         /* Loop descendants and build an assoc array */

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

@@ -125 +125 @@
                 $sql['from'] = "FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN " . CUSTOM_USER_META_TABLE . " um ON um.user_id = u.ID";
 
-                if ( $search_terms && bp_is_active( 'xprofile' ) || 'alphabetical' == $type )
-                        $sql['join_profiledata'] = "LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id";
-
                 $sql['where'] = 'WHERE ' . bp_core_get_status_sql( 'u.' );
 
@@ -164 +161 @@
                 }
 
-                if ( $search_terms && bp_is_active( 'xprofile' ) ) {
+                if ( $search_terms ) {
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
+                        $sql['where_searchterms'] = "AND u.display_name LIKE '%%$search_terms%%'";
                 }
 
@@ -177 +174 @@
                                 break;
                         case 'alphabetical':
-                                $sql[] = "ORDER BY pd.value ASC";
+                                $sql[] = "ORDER BY u.display_name ASC";
                                 break;
                         case 'random':

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

@@ -38 +38 @@
 
                         /* Get group admins and mods */
-                        $admin_mods = $wpdb->get_results( $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ) );
+                        $admin_mods = $wpdb->get_results( apply_filters( 'bp_group_admin_mods_user_join_filter', $wpdb->prepare( "SELECT u.ID as user_id, u.user_login, u.user_email, u.user_nicename, m.is_admin, m.is_mod FROM {$wpdb->users} u, {$bp->groups->table_name_members} m WHERE u.ID = m.user_id AND m.group_id = %d AND ( m.is_admin = 1 OR m.is_mod = 1 )", $this->id ), $this->id ) );
                         foreach( (array)$admin_mods as $user ) {
                                 if ( (int)$user->is_admin )