Ticket #8355: 8355.2.patch

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

@@ -344 +344 @@
         return $retval;
 }
 
+/**
+ * Adds the `bp_moderate` cap to the Administrator role.
+ *
+ * @since 7.0.0
+ *
+ * @param WP_Roles $wp_roles The WordPress roles object.
+ */
+function _bp_roles_init( WP_Roles $wp_roles ) {
+        $wp_roles->roles[ 'administrator' ]['capabilities']['bp_moderate']      = true;
+        $wp_roles->role_objects[ 'administrator' ]->capabilities['bp_moderate'] = true;
+}
+add_action( 'wp_roles_init', '_bp_roles_init', 10, 1 );
+
+/** Deprecated ****************************************************************/
+
 /**
  * Temporary implementation of 'bp_moderate' cap.
  *
@@ -363 +378 @@
  * Plugin authors: Please do not use this function; thank you. :)
  *
  * @since 1.6.0
+ * @deprecated 7.0.0
  *
  * @access private
  *
@@ -375 +391 @@
  * @return array $allcaps The user's cap list, with 'bp_moderate' appended, if relevant.
  */
 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.
         if ( 'bp_moderate' !== $cap ) {
@@ -394 +411 @@
         // Only users that can 'manage_options' on this site can 'bp_moderate'.
         return array( 'manage_options' );
 }
-add_filter( 'map_meta_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 4 );
-
-/** Deprecated ****************************************************************/
 
 /**
  * Adds BuddyPress-specific user roles.