Changeset 6185

Timestamp:

07/18/2012 06:16:32 PM (12 years ago)

Author:

boonebgorges

Message:

Improves current_user_can( 'bp_moderate' ) implementation for 1.6 release

The newly introduced bp_moderate cap must be manually added to the
Administrator role on order for it to work properly under the current
implementation of BP caps, wherein they are not stored in the database like
other caps.

This is a workaround, which will be reverted for BP 1.7.

Allows other caps passing through bp_current_user_can() to be evaluated
properly, without being overridden for super admins.

Fixes #4296

File:

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

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

@@ -380 +380 @@
 function bp_current_user_can( $capability, $blog_id = 0 ) {
 
-    // @todo: remove this when implemented
-    if ( is_super_admin() )
-        return true;
-
     // Use root blog if no ID passed
     if ( empty( $blog_id ) )
@@ -393 +389 @@
 }
 
+/**
+ * Temporary implementation of 'bp_moderate' cap
+ *
+ * In BuddyPress 1.6, the 'bp_moderate' cap was introduced. In order to enforce that
+ * bp_current_user_can( 'bp_moderate' ) always returns true for Administrators, we must manually
+ * add the 'bp_moderate' cap to the list of user caps for Admins.
+ *
+ * Note that this level of enforcement is only necessary in the case of non-Multisite. This is
+ * because WordPress automatically assigns every capability - and thus 'bp_moderate' - to Super
+ * Admins on a Multisite installation. See WP_User::has_cap().
+ *
+ * This implementation of 'bp_moderate' is temporary, until BuddyPress properly matches caps to
+ * roles and stores them in the database. Plugin authors: Do not use this function.
+ *
+ * @since BuddyPress (1.6)
+ * @see WP_User::has_cap()
+ *
+ * @param array $allcaps The caps that WP associates with the given role
+ * @param array $caps The caps being tested for in WP_User::has_cap()
+ * @param array $args Miscellaneous arguments passed to the user_has_cap filter
+ * @return array $allcaps The user's cap list, with 'bp_moderate' appended, if relevant
+ */
+function _bp_enforce_bp_moderate_cap_for_admins( $allcaps, $caps, $args ) {
+    if ( in_array( 'bp_moderate', $caps ) &&   // We only care if checking for bp_moderate
+         !in_array( 'do_not_allow', $caps ) && // 'do_not_allow' overrides everything else
+         !is_multisite() &&                    // Check not necessary on Multisite
+         isset( $allcaps['delete_users'] ) )   // Mimicking WP's check for Administrator status
+    {
+        $allcaps['bp_moderate'] = true;
+    }
+
+    return $allcaps;
+}
+add_filter( 'user_has_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 3 );
+
 ?>