Changeset 6087

Timestamp:

09/01/2016 08:05:17 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Moderation: Skip moderator query if per-forum moderation is not enabled.

Props jmdodd. Fixes #2988.

Location:

trunk/src/includes

Files:

• forums/capabilities.php (modified) (1 diff)
• replies/capabilities.php (modified) (1 diff)

trunk/src/includes/forums/capabilities.php

@@ -258 +258 @@
     $user_id   = bbp_get_user_id( $user_id, false, ! empty( $user_id ) );
     $forum_id  = bbp_get_forum_id( $forum_id );
-
-    // Get forums the user can moderate.
-    $forum_ids = bbp_get_moderator_forum_ids( $user_id );
-
-    // Is this forum ID in the users array of forum IDs?
-    if ( ! empty( $forum_ids ) ) {
-        $retval = in_array( $forum_id, $forum_ids );
+    $forum_ids = array();
+
+    // Only check if per-forum moderation is enabled
+    if ( bbp_allow_forum_mods() ) {
+
+        // Get forums the user can moderate.
+        $forum_ids = bbp_get_moderator_forum_ids( $user_id );
+
+        // Is this forum ID in the users array of forum IDs?
+        if ( ! empty( $forum_ids ) ) {
+            $retval = in_array( $forum_id, $forum_ids );
+        }
     }
 

trunk/src/includes/replies/capabilities.php

@@ -135 +135 @@
 
                 // User is a per-forum moderator, make sure they can spectate.
-                } elseif ( bbp_allow_forum_mods() && bbp_is_user_forum_moderator( $user_id, bbp_get_reply_forum_id( $_post->ID ) ) ) {
+                } elseif ( bbp_is_user_forum_moderator( $user_id, bbp_get_reply_forum_id( $_post->ID ) ) ) {
                     $caps = array( 'spectate' );