Ticket #2069: anon-spectate-filterable.diff

includes/core/capabilities.php

@@ -176 +176 @@
                         $caps = array(
 
                                 // Primary caps
-                                'spectate'              => false,
+                                'spectate'              => true,
                                 'participate'           => false,
                                 'moderate'              => false,
                                 'throttle'              => false,

includes/users/capabilities.php

@@ -222 +222 @@
         if ( ! did_action( 'set_current_user' ) )
                 return;
 
+        // Load up bbPress once
+        $bbp         = bbpress();
+
         // Bail if not logged in or already a member of this site
-        if ( ! is_user_logged_in() )
-                return;
+        if ( ! is_user_logged_in() ) {
+                $user_role = '';
+                $add_to_site = false;
+        } else {
+                // Get the current user ID
+                $user_id = bbp_get_current_user_id();
 
-        // Get the current user ID
-        $user_id = bbp_get_current_user_id();
+                // Bail if user already has a forums role
+                if ( bbp_get_user_role( $user_id ) )
+                        return;
 
-        // Bail if user already has a forums role
-        if ( bbp_get_user_role( $user_id ) )
-                return;
+                // Bail if user is marked as spam or is deleted
+                if ( bbp_is_user_inactive( $user_id ) )
+                        return;
 
-        // Bail if user is marked as spam or is deleted
-        if ( bbp_is_user_inactive( $user_id ) )
-                return;
+                /** Ready *****************************************************************/
 
-        /** Ready *****************************************************************/
+                // Get whether or not to add a role to the user account
+                $add_to_site = bbp_allow_global_access();
 
-        // Load up bbPress once
-        $bbp         = bbpress();
+                // Get the current user's WordPress role. Set to empty string if none found.
+                $user_role   = bbp_get_user_blog_role( $user_id );
+        }
 
-        // Get whether or not to add a role to the user account
-        $add_to_site = bbp_allow_global_access();
-
-        // Get the current user's WordPress role. Set to empty string if none found.
-        $user_role   = bbp_get_user_blog_role( $user_id );
-
         // Get the role map
         $role_map    = bbp_get_user_role_map();
 
@@ -295 +297 @@
                 'editor'        => $default_role,
                 'author'        => $default_role,
                 'contributor'   => $default_role,
-                'subscriber'    => $default_role
+                'subscriber'    => $default_role,
+                '' => bbp_get_blocked_role(),
         ) );
 }
 

includes/users/functions.php

@@ -1109 +1109 @@
 function bbp_forum_enforce_blocked() {
 
         // Bail if not logged in or super admin
-        if ( ! is_user_logged_in() || is_super_admin() ) {
+        if ( is_super_admin() ) {
                 return;
         }