Ticket #3234: non_invasive_meta_query.diff

.php

@@ -1850 +1850 @@
                 // Get any existing meta queries
                 $meta_query   = (array) $posts_query->get( 'meta_query', array() );
 
+                // Don't add our meta query if we would mess up the existing query, as we shouldn't impose the presence of _bbp_forum_id meta key on the posts, for queries that aren't our own
+                if ( array_key_exists( 'relation', $meta_query ) && $meta_query['relation'] != 'OR' )
+                        return;
+
+                // Add this condition to not mess up with non-bbPress queries, making the presence of _bbp_forum_id meta key on the posts be optional
+                $meta_query['relation'] = 'OR';
+                $meta_query[] = array(
+                        'key' => '_bbp_forum_id',
+                        'compare' => 'NOT EXISTS',
+                        'value' => '',
+                );
+
                 // Add our meta query to existing
                 $meta_query[] = $forum_ids;