Use 'view_private_members_of_group' cap rather than hardcoding checks.

See cuny-academic-commons/commons-in-a-box#469.
cuny-academic-commons · Jul 15, 2024 · 326c38c · 326c38c
1 parent e49a334
commit 326c38c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/buddypress/groups/single/activity-list.php b/buddypress/groups/single/activity-list.php
@@ -14,7 +14,7 @@
  $group = groups_get_current_group();
  $group_url = bp_get_group_permalink( $group );
 
- if ( current_user_can( 'bp_moderate' ) || groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
+ if ( current_user_can( 'view_private_members_of_group', $group->id ) ) {
  $group_private_members = [];
  } else {
  $group_private_members = openlab_get_private_members_of_group( $group->id );

diff --git a/buddypress/groups/single/members.php b/buddypress/groups/single/members.php
@@ -6,7 +6,7 @@
 $private_users = openlab_get_private_members_of_group( bp_get_current_group_id() );
 
 // If user is not mod and there are private users, exclude them from the list
-if ( ! current_user_can( 'bp_moderate' ) && ! empty( $private_users ) ) {
+if ( ! current_user_can( 'view_private_members_of_group' ) && ! empty( $private_users ) ) {
  $members_args['exclude'] = $private_users;
 }
 

diff --git a/lib/group-funcs.php b/lib/group-funcs.php
@@ -1792,7 +1792,7 @@ function openlab_show_site_posts_and_comments() {
 
  switch ( $site_type ) {
  case 'local':
- if ( current_user_can( 'bp_moderate' ) || groups_is_user_member( bp_loggedin_user_id(), $group_id ) ) {
+ if ( current_user_can( 'view_private_members_of_group', $group_id ) ) {
  $group_private_members = [];
  $post__not_in = [];
  } else {

diff --git a/lib/menus.php b/lib/menus.php
@@ -886,8 +886,8 @@ function openlab_filter_subnav_members( $subnav_item ) {
 
  // Get a member count for formatting.
  $total_mem = (int) groups_get_groupmeta( bp_get_current_group_id(), 'total_member_count' );
- if ( ! current_user_can( 'bp_moderate' ) ) {
- $private_users = openlab_get_private_members_of_group( bp_get_current_group_id() );
+ if ( ! current_user_can( 'view_private_members_of_group' ) ) {
+ $private_users = openlab_get_private_members_of_group( bp_get_current_group_id(), false );
  if ( $private_users ) {
  $total_mem -= count( $private_users );
  }