Changeset 10820

Timestamp:

05/28/2016 09:17:35 PM (9 years ago)

Author:

r-a-y

Message:

Replace group membership static DB method calls with group membership functions.

Our group membership functions now have better caching logic due to #6327
and #7078.

This commit switches all our older group membership static DB method calls
with these group membership functions so sites enabled with an object cache
can benefit from these improvements.

Props r-a-y, boonebgorges, dcavins.

Fixes #7078.

Location:

trunk/src

Files:

• bp-friends/classes/class-bp-friends-friendship.php (modified) (3 diffs)
• bp-groups/bp-groups-screens.php (modified) (1 diff)
• bp-groups/classes/class-bp-groups-group.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -656 +656 @@
      *
      * @since 1.0.0
+     * @todo Need to do a group component check before using group functions.
      *
      * @param int $user_id  ID of the user whose friends are being counted.
@@ -664 +665 @@
 
         // Setup some data we'll use below.
-        $is_group_admin  = BP_Groups_Member::check_is_admin( $user_id, $group_id );
+        $is_group_admin  = groups_is_user_admin( $user_id, $group_id );
         $friend_ids      = BP_Friends_Friendship::get_friend_user_ids( $user_id );
         $invitable_count = 0;
@@ -671 +672 @@
 
             // If already a member, they cannot be invited again.
-            if ( BP_Groups_Member::check_is_member( (int) $friend_ids[$i], $group_id ) )
+            if ( groups_is_user_member( (int) $friend_ids[$i], $group_id ) ) {
                 continue;
+            }
 
             // If user already has invite, they cannot be added.
-            if ( BP_Groups_Member::check_has_invite( (int) $friend_ids[$i], $group_id )  )
+            if ( groups_check_user_has_invite( (int) $friend_ids[$i], $group_id ) ) {
                 continue;
+            }
 
             // If user is not group admin and friend is banned, they cannot be invited.
-            if ( ( false === $is_group_admin ) && BP_Groups_Member::check_is_banned( (int) $friend_ids[$i], $group_id ) )
+            if ( ( false === $is_group_admin ) && groups_is_user_banned( (int) $friend_ids[$i], $group_id ) ) {
                 continue;
+            }
 
             $invitable_count++;

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

@@ -691 +691 @@
         $message = __( 'You are not allowed to send or remove invites', 'buddypress' );
         $error = 'error';
-    } elseif ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
+    } elseif ( groups_check_for_membership_request( $friend_id, $group_id ) ) {
         $message = __( 'The member requested to join the group', 'buddypress' );
         $error = 'error';

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

@@ -246 +246 @@
             // Set user-specific data.
             $user_id          = bp_loggedin_user_id();
-            $this->is_member  = BP_Groups_Member::check_is_member( $user_id, $this->id );
-            $this->is_invited = BP_Groups_Member::check_has_invite( $user_id, $this->id );
-            $this->is_pending = BP_Groups_Member::check_for_membership_request( $user_id, $this->id );
+            $this->is_member  = groups_is_user_member( $user_id, $this->id );
+            $this->is_invited = groups_check_user_has_invite( $user_id, $this->id );
+            $this->is_pending = groups_check_for_membership_request( $user_id, $this->id );
 
             // If this is a private or hidden group, does the current user have access?

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1279 +1279 @@
         // Users who have previously requested membership do not need
         // another invitation created for them.
-        if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
+        if ( groups_check_for_membership_request( $friend_id, $group_id ) ) {
             $user_status = 'is_pending';