Changeset 8057

Timestamp:

03/06/2014 02:32:19 AM (11 years ago)

Author:

r-a-y

Message:

Groups: Introduces new function - groups_get_invite_count_for_user().

Previously, BP_Groups_Member::get_invites() did two queries -- one to
get a paginated array of group invites for a user and the second to
get the total group invite count for a user.

This commit:

• Splits up the total group invite count query into a separate class method - BP_Group_Member::get_invite_count_for_user()
• Adds a wrapper function - groups_get_invite_count_for_user() - and uses it in the BP_Groups_Component class where the invite count is only needed.

The group invite count will be cached in a future commit.

Location:

trunk/bp-groups

Files:

• bp-groups-classes.php (modified) (1 diff)
• bp-groups-functions.php (modified) (1 diff)
• bp-groups-loader.php (modified) (1 diff)

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

@@ -2316 +2316 @@
 
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE g.id = m.group_id AND g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count' AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY m.date_modified ASC {$pag_sql}", $user_id ) );
-        $total_groups = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY date_modified ASC", $user_id ) );
-
-        return array( 'groups' => $paged_groups, 'total' => $total_groups );
+
+        return array( 'groups' => $paged_groups, 'total' => self::get_invite_count_for_user( $user_id ) );
+    }
+
+    /**
+     * Gets the total group invite count for a user.
+     *
+     * @since BuddyPress (2.0.0)
+     *
+     * @param int $user_id The user ID
+     * @return int
+     */
+    public static function get_invite_count_for_user( $user_id = 0 ) {
+        global $wpdb;
+
+        return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND m.is_confirmed = 0 AND m.inviter_id != 0 AND m.invite_sent = 1 AND m.user_id = %d {$exclude_sql} ORDER BY date_modified ASC", $user_id ) );
     }
 

trunk/bp-groups/bp-groups-functions.php

@@ -664 +664 @@
 }
 
+/**
+ * Gets the total group invite count for a user.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param int $user_id The user ID
+ * @return int
+ */
+function groups_get_invite_count_for_user( $user_id = 0 ) {
+    if ( empty( $user_id ) ) {
+        $user_id = bp_loggedin_user_id();
+    }
+
+    return BP_Groups_Member::get_invite_count_for_user( $user_id );
+}
+
 function groups_invite_user( $args = '' ) {
 

trunk/bp-groups/bp-groups-loader.php

@@ -537 +537 @@
 
             // Pending group invites
-            $count   = groups_get_invites_for_user( bp_loggedin_user_id() );
+            $count   = groups_get_invite_count_for_user();
             $title   = __( 'Groups',             'buddypress' );
             $pending = __( 'No Pending Invites', 'buddypress' );
 
             if ( !empty( $count['total'] ) ) {
-                $title   = sprintf( __( 'Groups <span class="count">%s</span>',          'buddypress' ), $count['total'] );
-                $pending = sprintf( __( 'Pending Invites <span class="count">%s</span>', 'buddypress' ), $count['total'] );
+                $title   = sprintf( __( 'Groups <span class="count">%s</span>',          'buddypress' ), $count );
+                $pending = sprintf( __( 'Pending Invites <span class="count">%s</span>', 'buddypress' ), $count );
             }