Changeset 7403 for trunk/src/includes/forums/functions.php

Timestamp:

05/07/2026 08:49:10 PM (3 weeks ago)

Author:

johnjamesjacoby

Message:

Component - Forums: Improve forum visibility exclusion.

This commit updates forum visibility query normalization so mixed post-type queries are handled as intended, exclusion IDs are consistently normalized, and generated meta query clauses are more consistent.

Changes include:

• Use array_intersect() to detect whether a bbPress post type is in the post_type query var
• Use NOT IN with an array value for meta_query exclusions, and let the query optimizer do its thing
• Normalize only once per WP_Query via a dedicated query var
• Normalize post__not_in values with wp_parse_id_list()
• Validate filtered meta_query shape before appending to existing meta clauses

In trunk, for 2.7.

See #3668.

File:

• trunk/src/includes/forums/functions.php (modified) (6 diffs)

trunk/src/includes/forums/functions.php

@@ -2293 +2293 @@
         if ( ! empty( $forum_ids ) ) {
 
-            // Comparison
-            $compare = ( 1 < count( $forum_ids ) )
-                ? 'NOT IN'
-                : '!=';
-
             // Setup types
             $types['array']      = $forum_ids;
@@ -2303 +2298 @@
             $types['meta_query'] = array(
                 'key'     => '_bbp_forum_id',
-                'value'   => $types['string'],
+                'value'   => $forum_ids,
                 'type'    => 'NUMERIC',
-                'compare' => $compare
+                'compare' => 'NOT IN'
             );
         }
@@ -2358 +2353 @@
 
     // Compare queried post-types to supported post-types
-    $bbp_post_types = array_diff( $post_types, bbp_get_post_types() );
-
-    // Bail if not a bbPress post type
-    if ( ! empty( $bbp_post_types ) ) {
-        return;
-    }
+    $bbp_post_types = array_intersect( $post_types, bbp_get_post_types() );
+
+    // Bail if no bbPress post type is being queried
+    if ( empty( $bbp_post_types ) ) {
+        return;
+    }
+
+    // Bail if this query has already been normalized
+    if ( $posts_query->get( '_bbp_forum_visibility_normalized' ) ) {
+        return;
+    }
+
+    // Mark this query as normalized
+    $posts_query->set( '_bbp_forum_visibility_normalized', true );
 
     // Forums
@@ -2381 +2384 @@
 
             // Add our not-in to existing
-            $not_in = array_unique( array_merge( $not_in, $forum_ids ) );
+            $not_in = wp_parse_id_list( array_merge( $not_in, $forum_ids ) );
 
             // Set the new not-in val
@@ -2389 +2392 @@
 
     // Get forums to exclude
-    $forum_ids = bbp_exclude_forum_ids( 'meta_query' );
+    $forum_meta_query = bbp_exclude_forum_ids( 'meta_query' );
 
     // Excluding some forums
-    if ( ! empty( $forum_ids ) ) {
+    if ( is_array( $forum_meta_query ) && ! empty( $forum_meta_query['key'] ) && ! empty( $forum_meta_query['value'] ) ) {
 
         // Get any existing meta queries
@@ -2398 +2401 @@
 
         // Add our meta query to existing
-        $meta_query[] = $forum_ids;
+        $meta_query[] = $forum_meta_query;
 
         // Set the new meta_query val