Changeset 13531

Timestamp:

07/28/2023 04:15:02 PM (3 years ago)

Author:

dcavins

Message:

Introduce bp_view capability.

Introduce a new, base-level capability, bp_view,
that by default maps to the most base-level WordPress
capability, exist.

See #8734.

Location:

trunk/src

Files:

• bp-activity/bp-activity-functions.php (modified) (4 diffs)
• bp-core/bp-core-caps.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -3305 +3305 @@
     }
 
+    if ( ! bp_current_user_can( 'bp_view', array( 'bp_component' => 'activity' ) ) ) {
+        $retval = false;
+    }
+
     // If activity is from a group, do extra cap checks.
-    if ( bp_is_active( 'groups' ) && buddypress()->groups->id === $activity->component ) {
+    if ( bp_is_active( 'groups' ) && buddypress()->groups->id === $activity->component && bp_current_user_can( 'bp_view', array( 'bp_component' => 'groups' ) ) ) {
         // Check to see if the user has access to the activity's parent group.
         $group = groups_get_group( $activity->item_id );
@@ -4483 +4487 @@
  *
  * @since 8.0.0
+ * @since 12.0.0 Added bp_current_user_can( 'bp_view' ) check.
  *
  * @param string $feed_id The feed identifier. Possible values are:
@@ -4488 +4493 @@
  */
 function bp_activity_is_feed_enable( $feed_id = '' ) {
+    $retval = bp_current_user_can( 'bp_view', array( 'bp_component' => 'activity' ) );
+
     /**
      * Filters if BuddyPress should consider feeds enabled. If disabled, it will return early.
@@ -4494 +4501 @@
      * @since 8.0.0 Adds the `$feed_id` parameter.
      *
-     * @param bool   $value   Defaults to true aka feeds are enabled.
+     * @param bool   $retval  Whether this feed is enabled or not.
      * @param string $feed_id The feed identifier.
      */
-    return (bool) apply_filters( 'bp_activity_enable_feeds', true, $feed_id );
-}
+    return (bool) apply_filters( 'bp_activity_enable_feeds', $retval, $feed_id );
+}

trunk/src/bp-core/bp-core-caps.php

@@ -125 +125 @@
  *
  * @since 1.6.0
+ * @since 12.0.0 Added mapping for `bp_view` capability.
  *
  * @see WP_User::has_cap() for description of the arguments passed to the
@@ -137 +138 @@
  */
 function bp_map_meta_caps( $caps, $cap, $user_id, $args ) {
+
+    switch ( $cap ) {
+        case 'bp_view' :
+            $caps = array( 'exist' );
+            if ( ! $user_id ) {
+
+                // A BuddyPress component ID may be optionally passed with the `bp_view` check.
+                $component = isset( $args['bp_component'] ) ? $args['bp_component'] : '';
+
+                if ( 'members' === bp_get_community_visibility( $component ) ) {
+                    $caps = array( 'do_not_allow' );
+                }
+            }
+            break;
+    }
 
     /**