Ticket #2308: 2308.2.patch

includes/common/functions.php

@@ -1532 +1532 @@
                 // Forum/Topic/Reply Feed
                 if ( isset( $query_vars['post_type'] ) ) {
                     
+                        // Matched post type
+                        $post_type = false;
+
+                        // Post types to check
+                        $post_types = array(
+                                bbp_get_forum_post_type(),
+                                bbp_get_topic_post_type(),
+                                bbp_get_reply_post_type()
+                        );
+
+                        // Cast query vars as array outside of foreach loop
+                        $qv_array = (array) $query_vars['post_type'];
+
+                        // Check if this query is for a bbPress post type
+                        foreach ( $post_types as $bbp_pt ) {
+                            if ( in_array( $bbp_pt, $qv_array, true ) ) {
+                                    $post_type = $bbp_pt;
+                                    break;
+                            }
+                        }
+
+                        // Looking at a bbPress post type
+                        if ( ! empty( $post_type ) ) {
+
                         // Supported select query vars
                         $select_query_vars = array(
-                                'p'                      => false,
-                                'name'                   => false,
-                                $query_vars['post_type'] => false
+                                        'p'        => false,
+                                        'name'     => false,
+                                        $post_type => false,
                         );
 
                         // Setup matched variables to select
@@ -1550 +1574 @@
                         $select_query_vars = array_filter( $select_query_vars );
 
                         // What bbPress post type are we looking for feeds on?
-                        switch ( $query_vars['post_type'] ) {
+                                switch ( $post_type ) {
 
                                 // Forum
                                 case bbp_get_forum_post_type() :
@@ -1686 +1710 @@
 
                                         break;
                         }
+                        }
 
                 // Single Topic Vview
                 } elseif ( isset( $query_vars['bbp_view'] ) ) {