Changeset 11896

Timestamp:

03/07/2018 12:56:49 PM (7 years ago)

Author:

dcavins

Message:

Revert bp_group_is_visible() to check access.

In r11761, bp_group_is_visible() was changed to rely on the BP_Groups_Group->is_visible property. However, bp_group_is_visible() has been used to check access, not visibility, making the new logic, even though it seems sensible, wrong.

This changeset also replaces bp_group_is_visible() in the BP Nouveau template parts, to start retiring this no-longer-correctly-named function.

Props r-a-y.

See #7608.

Location:

trunk/src

Files:

• bp-groups/bp-groups-template.php (modified) (2 diffs)
• bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/groups/template-tags.php (modified) (1 diff)

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

@@ -468 +468 @@
 
 /**
- * Is the group visible to the currently logged-in user?
+ * Is the group accessible to the currently logged-in user?
+ * Despite the name of the function, it has historically checked
+ * whether a user has access to a group. 
+ * In BP 2.9, a property was added to the BP_Groups_Group class, 
+ * `is_visible`, that describes whether a user can know the group exists.
+ * If you wish to check that property, use the check: 
+ * bp_current_user_can( 'groups_see_group' ).
  *
  * @since 1.0.0
@@ -486 +492 @@
     }
 
-    if ( ! empty( $group->is_visible ) ) {
-        return true;
-    }
-
-    return false;
+    return bp_current_user_can( 'groups_access_group', array( 'group_id' => $group->id ) );
 }
 

trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/parts/header-item-actions.php

@@ -8 +8 @@
 <div id="item-actions" class="group-item-actions">
 
-    <?php if ( bp_group_is_visible() ) : ?>
+    <?php if ( bp_current_user_can( 'groups_access_group' ) ) : ?>
 
         <dl class="moderators-lists">

trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

@@ -1154 +1154 @@
     $bp_is_group_home = bp_is_group_home();
 
-    if ( $bp_is_group_home && ! bp_group_is_visible() ) {
+    if ( $bp_is_group_home && ! bp_current_user_can( 'groups_access_group' ) ) {
         /**
          * Fires before the display of the group status message.