Ticket #3234: 3234.2.patch

src/includes/forums/functions.php

@@ -2052 +2052 @@
                 $posts_query->set( 'post__not_in', $not_in );
 
         // Some other post type besides Forums, Topics, or Replies
-        } elseif ( ! array_diff( $post_types, bbp_get_post_types() ) ) {
+        } elseif ( array_diff( $post_types, bbp_get_post_types() ) ) {
 
                 // Get forums to exclude
                 $forum_ids = bbp_exclude_forum_ids( 'meta_query' );
@@ -2063 +2063 @@
                 }
 
                 // Get any existing meta queries
-                $meta_query   = (array) $posts_query->get( 'meta_query', array() );
+                $meta_query = (array) $posts_query->get( 'meta_query', array() );
 
-                // Add our meta query to existing
-                $meta_query[] = $forum_ids;
+                // Don't add another meta query if there is already a complex meta
+                // relationship being queried for, or an "AND" query we shouldn't touch.
+                if ( isset( $meta_query['relation'] ) && ( $meta_query['relation'] != 'OR' ) ) {
+                        return;
+                }
 
+                // This condition avoids interferece with non-bbPress queries, making
+                // the presence of _bbp_forum_id meta key on posts be optional.
+                $not_bbp = array(
+                        'key'     => '_bbp_forum_id',
+                        'compare' => 'NOT EXISTS',
+                        'value'   => ''
+                );
+
+                // Add forum IDs and NOT EXISTS to a separate meta-query condition
+                $meta_query[] = array(
+                        'relation' => 'OR',
+                        $forum_ids,
+                        $not_bbp
+                );
+
                 // Set the meta_query var
                 $posts_query->set( 'meta_query', $meta_query );
         }