Changeset 5030

Timestamp:

07/15/2013 02:57:39 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Remove hard-coded negative capabilities from bbp_get_caps_for_role() for all roles expect 'Blocked'. Prevents over-aggressively and explicitly disallowing role based capabilities, and allows role manager plugins to more effectively manipulate bbPress user capabilities.

Fixes bug where negative user capabilities could not be overridden if negative caps were saved to all_caps array. See #1939.

File:

• trunk/includes/core/capabilities.php (modified) (4 diffs)

trunk/includes/core/capabilities.php

@@ -96 +96 @@
                 'publish_forums'        => true,
                 'edit_forums'           => true,
-                'edit_others_forums'    => false,
-                'delete_forums'         => false,
-                'delete_others_forums'  => false,
                 'read_private_forums'   => true,
                 'read_hidden_forums'    => true,
@@ -133 +130 @@
                 // Primary caps
                 'spectate'              => true,
+            );
+
+            break;
+
+        // Explicitly blocked
+        case bbp_get_blocked_role() :
+            $caps = array(
+
+                // Primary caps
+                'spectate'              => false,
                 'participate'           => false,
                 'moderate'              => false,
@@ -172 +179 @@
             break;
 
-        // Explicitly blocked
-        case bbp_get_blocked_role() :
-            $caps = array(
-
-                // Primary caps
-                'spectate'              => false,
-                'participate'           => false,
-                'moderate'              => false,
-                'throttle'              => false,
-                'view_trash'            => false,
-
-                // Forum caps
-                'publish_forums'        => false,
-                'edit_forums'           => false,
-                'edit_others_forums'    => false,
-                'delete_forums'         => false,
-                'delete_others_forums'  => false,
-                'read_private_forums'   => false,
-                'read_hidden_forums'    => false,
-
-                // Topic caps
-                'publish_topics'        => false,
-                'edit_topics'           => false,
-                'edit_others_topics'    => false,
-                'delete_topics'         => false,
-                'delete_others_topics'  => false,
-                'read_private_topics'   => false,
-
-                // Reply caps
-                'publish_replies'       => false,
-                'edit_replies'          => false,
-                'edit_others_replies'   => false,
-                'delete_replies'        => false,
-                'delete_others_replies' => false,
-                'read_private_replies'  => false,
-
-                // Topic tag caps
-                'manage_topic_tags'     => false,
-                'edit_topic_tags'       => false,
-                'delete_topic_tags'     => false,
-                'assign_topic_tags'     => false,
-            );
-
-            break;
-
         // Participant/Default
         case bbp_get_participant_role() :
@@ -225 +187 @@
                 'spectate'              => true,
                 'participate'           => true,
-                'moderate'              => false,
-                'throttle'              => false,
-                'view_trash'            => false,
 
                 // Forum caps
-                'publish_forums'        => false,
-                'edit_forums'           => false,
-                'edit_others_forums'    => false,
-                'delete_forums'         => false,
-                'delete_others_forums'  => false,
                 'read_private_forums'   => true,
-                'read_hidden_forums'    => false,
 
                 // Topic caps
                 'publish_topics'        => true,
                 'edit_topics'           => true,
-                'edit_others_topics'    => false,
-                'delete_topics'         => false,
-                'delete_others_topics'  => false,
-                'read_private_topics'   => false,
 
                 // Reply caps
                 'publish_replies'       => true,
                 'edit_replies'          => true,
-                'edit_others_replies'   => false,
-                'delete_replies'        => false,
-                'delete_others_replies' => false,
-                'read_private_replies'  => false,
 
                 // Topic tag caps
-                'manage_topic_tags'     => false,
-                'edit_topic_tags'       => false,
-                'delete_topic_tags'     => false,
                 'assign_topic_tags'     => true,
             );