Changeset 4838 for trunk/includes/common/functions.php

Timestamp:

04/10/2013 04:18:43 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Update bbp_request_feed_trap() to accept more query variables; fixes issues with non-pretty permalinks. Props alex-ye. Fixes #2296.

File:

• trunk/includes/common/functions.php (modified) (8 diffs)

trunk/includes/common/functions.php

@@ -1492 +1492 @@
         // Forum/Topic/Reply Feed
         if ( isset( $query_vars['post_type'] ) ) {
+                    
+            // Supported select query vars
+            $select_query_vars = array(
+                'p'                      => false,
+                'name'                   => false,
+                $query_vars['post_type'] => false
+            );
+
+            // Setup matched variables to select
+            foreach ( $query_vars as $key => $value ) {
+                if ( isset( $select_query_vars[$key] ) ) {
+                    $select_query_vars[$key] = $value;
+                }
+            }
+
+            // Remove any empties
+            $select_query_vars = array_filter( $select_query_vars );
 
             // What bbPress post type are we looking for feeds on?
@@ -1503 +1520 @@
 
                     // Single forum
-                    if ( isset( $query_vars[bbp_get_forum_post_type()] ) ) {
+                    if ( !empty( $select_query_vars ) ) {
 
                         // Load up our own query
-                        query_posts( array(
+                        query_posts( array_merge( array(
                             'post_type' => bbp_get_forum_post_type(),
-                            'name'      => $query_vars[bbp_get_forum_post_type()],
                             'feed'      => true
-                        ) );
+                        ), $select_query_vars ) );
 
                         // Restrict to specific forum ID
@@ -1530 +1546 @@
                             'post_type'      => bbp_get_reply_post_type(),
                             'post_parent'    => 'any',
-                            'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
+                            'post_status'    => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
                             'posts_per_page' => bbp_get_replies_per_rss_page(),
                             'order'          => 'DESC',
@@ -1548 +1564 @@
                             'post_type'      => bbp_get_topic_post_type(),
                             'post_parent'    => bbp_get_forum_id(),
-                            'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
+                            'post_status'    => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
                             'posts_per_page' => bbp_get_topics_per_rss_page(),
                             'order'          => 'DESC'
@@ -1560 +1576 @@
 
                         // Exclude private/hidden forums if not looking at single
-                        if ( empty( $query_vars['forum'] ) )
+                        if ( empty( $select_query_vars ) )
                             $meta_query = array( bbp_exclude_forum_ids( 'meta_query' ) );
 
@@ -1569 +1585 @@
                             'post_type'      => array( bbp_get_reply_post_type(), bbp_get_topic_post_type() ),
                             'post_parent'    => 'any',
-                            'post_status'    => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
+                            'post_status'    => array( bbp_get_public_status_id(), bbp_get_closed_status_id() ),
                             'posts_per_page' => bbp_get_replies_per_rss_page(),
                             'order'          => 'DESC',
@@ -1585 +1601 @@
 
                     // Single topic
-                    if ( isset( $query_vars[bbp_get_topic_post_type()] ) ) {
+                    if ( !empty( $select_query_vars ) ) {
 
                         // Load up our own query
-                        query_posts( array(
+                        query_posts( array_merge( array(
                             'post_type' => bbp_get_topic_post_type(),
-                            'name'      => $query_vars[bbp_get_topic_post_type()],
                             'feed'      => true
-                        ) );
+                        ), $select_query_vars ) );
 
                         // Output the feed
@@ -1626 +1641 @@
 
                     // All replies
-                    if ( !isset( $query_vars[bbp_get_reply_post_type()] ) ) {
+                    if ( empty( $select_query_vars ) ) {
                         bbp_display_replies_feed_rss2( $the_query );
                     }