Changeset 11544 for trunk/src/bp-groups/classes/class-bp-groups-component.php

Timestamp:

04/28/2017 02:36:15 PM (9 years ago)

Author:

dcavins

Message:

Add $is_visible and $is_user_member properties to BP_Groups_Group object.

During single group setup in the BP_Groups_Component, we're doing
some checks that duplicate logic that is, or should be, handled in
BP_Groups_Group. Then, BP_Groups_Component can rely on
BP_Groups_Group to provide the details via recently added magic
methods.

Note: $is_user_member is an alias of $is_member for backward
compatibility.

Fixes #7494.

File:

• trunk/src/bp-groups/classes/class-bp-groups-component.php (modified) (2 diffs)

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

@@ -241 +241 @@
                         if ( ! bp_is_item_admin() ) {
                                 bp_update_is_item_mod  ( groups_is_user_mod  ( bp_loggedin_user_id(), $this->current_group->id ), 'groups' );
-                        }
-
-                        // Is the logged in user a member of the group?
-                        if ( ( is_user_logged_in() && groups_is_user_member( bp_loggedin_user_id(), $this->current_group->id ) ) ) {
-                                $this->current_group->is_user_member = true;
-                        } else {
-                                $this->current_group->is_user_member = false;
-                        }
-
-                        // Should this group be visible to the logged in user?
-                        if ( 'public' == $this->current_group->status || $this->current_group->is_user_member ) {
-                                $this->current_group->is_visible = true;
-                        } else {
-                                $this->current_group->is_visible = false;
                         }
 
@@ -558 +544 @@
                         // show a "Request Membership" nav item.
                         if ( is_user_logged_in() &&
-                                 ! $this->current_group->is_user_member &&
+                                 ! $this->current_group->is_member &&
                                  ! groups_check_for_membership_request( bp_loggedin_user_id(), $this->current_group->id ) &&
                                  $this->current_group->status == 'private' &&