Changeset 12740 for trunk/src/bp-core/bp-core-caps.php

Timestamp:

10/04/2020 04:44:28 PM (4 years ago)

Author:

imath

Message:

Core: improve the way BuddyPress adds the bp_moderate cap to Admins

This capability is dynamically added to the users having the manage_options one on regular configurations of WordPress (non multisite).

The private function _bp_enforce_bp_moderate_cap_for_admins() has been deprecated and we are now using the private function _bp_roles_init() to do this capability mapping.

This need for improvement has been revealed by an issue about the incapacity for Admins to edit BP Emails if they weren't their authors.

Props shanebp, boonebgorges, johnjamesjacoby

Fixes #8355

File:

• trunk/src/bp-core/bp-core-caps.php (modified) (4 diffs)

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

@@ -346 +346 @@
 
 /**
+ * Adds the `bp_moderate` cap to Roles having the `manage_options` cap when
+ * BuddyPress is not active on the network.
+ *
+ * @since 7.0.0
+ *
+ * @access private
+ *
+ * @param WP_Roles $wp_roles The WordPress roles object.
+ */
+function _bp_roles_init( WP_Roles $wp_roles ) {
+    $roles_list = array();
+    $caps_list  = wp_list_pluck( $wp_roles->role_objects, 'capabilities' );
+
+    // Look for roles having the `manage_options` capability set to true.
+    $filtered_list = wp_list_filter( $caps_list, array( 'manage_options' => true ) );
+
+    if ( $filtered_list ) {
+        $roles_list = array_keys( $filtered_list );
+
+        // Loop into roles list to add the `bp_moderate` capability.
+        foreach ( $roles_list as $role ) {
+            if ( isset( $wp_roles->roles[ $role ] ) ) {
+                $wp_roles->roles[ $role ]['capabilities']['bp_moderate'] = true;
+            }
+
+            if ( isset( $wp_roles->role_objects[ $role ] ) ) {
+                $wp_roles->role_objects[ $role ]->capabilities['bp_moderate'] = true;
+            }
+        }
+    }
+
+    // Make sure to remove the `bp_moderate` capability from roles when BuddyPress is network activated.
+    if ( bp_is_network_activated() ) {
+        foreach ( $roles_list as $role ) {
+            unset( $wp_roles->roles[ $role ]['capabilities']['bp_moderate'], $wp_roles->role_objects[ $role ]->capabilities['bp_moderate'] );
+        }
+    }
+}
+add_action( 'wp_roles_init', '_bp_roles_init', 10, 1 );
+
+/** Deprecated ****************************************************************/
+
+/**
  * Temporary implementation of 'bp_moderate' cap.
  *
@@ -364 +407 @@
  *
  * @since 1.6.0
+ * @deprecated 7.0.0
  *
  * @access private
@@ -376 +420 @@
  */
 function _bp_enforce_bp_moderate_cap_for_admins( $caps = array(), $cap = '', $user_id = 0, $args = array() ) {
+    _deprecated_function( __FUNCTION__, '7.0.0' );
 
     // Bail if not checking the 'bp_moderate' cap.
@@ -395 +440 @@
     return array( 'manage_options' );
 }
-add_filter( 'map_meta_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 4 );
-
-/** Deprecated ****************************************************************/
 
 /**