Changeset 4167

Timestamp:

08/24/2012 06:59:11 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Forums:

• Remove superfluous is_super_admin() login in bbp_has_forums().
• Capes always pass current_user_can() checks unless specifically not allowed, which is the intended behavior here.

File:

• branches/plugin/bbp-includes/bbp-forum-template.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-forum-template.php

@@ -62 +62 @@
     $post_stati[] = bbp_get_public_status_id();
 
-    // Super admin get whitelisted post statuses
-    if ( is_super_admin() ) {
-        $post_stati = array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() );
-
-    // Not a super admin, so check caps
-    } else {
-
-        // Check if user can read private forums
-        if ( current_user_can( 'read_private_forums' ) )
-            $post_stati[] = bbp_get_private_status_id();
-
-        // Check if user can read hidden forums
-        if ( current_user_can( 'read_hidden_forums' ) )
-            $post_stati[] = bbp_get_hidden_status_id();
-    }
+    // Check if user can read private forums
+    if ( current_user_can( 'read_private_forums' ) )
+        $post_stati[] = bbp_get_private_status_id();
+
+    // Check if user can read hidden forums
+    if ( current_user_can( 'read_hidden_forums' ) )
+        $post_stati[] = bbp_get_hidden_status_id();
 
     // The default forum query for most circumstances