Changeset 3435

Timestamp:

08/21/2011 02:33:27 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Feed me 2.0! Improvements to feeds, allowing to filter by topic, reply, and defaulting to all. Works with single forums, topics, and their related content.

File:

• branches/plugin/bbp-includes/bbp-common-functions.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-common-functions.php

@@ -1180 +1180 @@
                                         if ( isset( $query_vars[bbp_get_forum_post_type()] ) ) {
 
+                                                // Get the forum by the path
+                                                $forum    = get_page_by_path( $query_vars[bbp_get_forum_post_type()], OBJECT, bbp_get_forum_post_type() );
+                                                $forum_id = $forum->ID;
+
                                                 // Load up our own query
                                                 $wp_query = new WP_Query( array(
                                                         'post_type' => bbp_get_forum_post_type(),
-                                                        'name'      => $query_vars[bbp_get_forum_post_type()]
+                                                        'ID'        => $forum_id
                                                 ) );
 
-                                                // Forum replies
-                                                if ( !empty( $_GET['type'] ) && ( bbp_get_reply_post_type() == $_GET['type'] ) ) {
-
-                                                        // The query
-                                                        $the_query = array(
-                                                                'author'         => 0,
-                                                                'post_type'      => bbp_get_reply_post_type(),
-                                                                'post_parent'    => 'any',
-                                                                'post_status'    => join( ',', array( 'publish', $bbp->closed_status_id ) ),
-                                                                'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
-                                                                'order'          => 'DESC',
-                                                                'meta_query'     => array( array(
-                                                                        'key'        => '_bbp_forum_id',
-                                                                        'value'      => bbp_get_forum_id(),
-                                                                        'compare'    => '='
-                                                                ) )
-                                                        );
-
-                                                        // Output the feed
-                                                        bbp_display_replies_feed_rss2( $the_query );
-
-                                                // Forum topics
-                                                } else {
-
-                                                        // The query
-                                                        $the_query = array(
-                                                                'author'         => 0,
-                                                                'post_type'      => bbp_get_topic_post_type(),
-                                                                'post_parent'    => bbp_get_forum_id(),
-                                                                'post_status'    => join( ',', array( 'publish', $bbp->closed_status_id ) ),
-                                                                'posts_per_page' => get_option( '_bbp_topics_per_rss_page', 25 ),
-                                                                'order'          => 'DESC',
-                                                                'meta_query'     => array( array(
-                                                                        'key'        => '_bbp_forum_id',
-                                                                        'value'      => bbp_get_forum_id(),
-                                                                        'compare'    => '='
-                                                                ) )
-                                                        );
-
-                                                        // Output the feed
-                                                        bbp_display_topics_feed_rss2( $the_query );
-                                                }
+                                                // Restrict to specific forum ID
+                                                $meta_query = array( array(
+                                                        'key'     => '_bbp_forum_id',
+                                                        'value'   => $forum_id,
+                                                        'compare' => '='
+                                                ) );
+                                                
+                                        // No restrictions on forum ID
+                                        } else {
+                                                $meta_query = array();
                                         }
 
+                                        // Only forum replies
+                                        if ( !empty( $_GET['type'] ) && ( bbp_get_reply_post_type() == $_GET['type'] ) ) {
+
+                                                // The query
+                                                $the_query = array(
+                                                        'author'         => 0,
+                                                        'post_type'      => bbp_get_reply_post_type(),
+                                                        'post_parent'    => 'any',
+                                                        'post_status'    => join( ',', array( 'publish', $bbp->closed_status_id ) ),
+                                                        'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
+                                                        'order'          => 'DESC',
+                                                        'meta_query'     => $meta_query
+                                                );
+
+                                                // Output the feed
+                                                bbp_display_replies_feed_rss2( $the_query );
+
+                                        // Only forum topics
+                                        } elseif ( !empty( $_GET['type'] ) && ( bbp_get_topic_post_type() == $_GET['type'] ) ) {
+
+                                                // The query
+                                                $the_query = array(
+                                                        'author'         => 0,
+                                                        'post_type'      => bbp_get_topic_post_type(),
+                                                        'post_parent'    => 'any',
+                                                        'post_status'    => join( ',', array( 'publish', $bbp->closed_status_id ) ),
+                                                        'posts_per_page' => get_option( '_bbp_topics_per_rss_page', 25 ),
+                                                        'order'          => 'DESC',
+                                                        'meta_query'     => $meta_query
+                                                );
+
+                                                // Output the feed
+                                                bbp_display_topics_feed_rss2( $the_query );
+
+                                        // All forum topics and replies
+                                        } else {
+
+                                                // The query
+                                                $the_query = array(
+                                                        'author'         => 0,
+                                                        'post_type'      => array( bbp_get_reply_post_type(), bbp_get_topic_post_type() ),
+                                                        'post_parent'    => 'any',
+                                                        'post_status'    => join( ',', array( 'publish', $bbp->closed_status_id ) ),
+                                                        'posts_per_page' => get_option( '_bbp_replies_per_rss_page', 25 ),
+                                                        'order'          => 'DESC',
+                                                        'meta_query'     => $meta_query
+                                                );
+
+                                                // Output the feed
+                                                bbp_display_replies_feed_rss2( $the_query );
+                                        }
+
                                         break;
 
-                                // Topic - Show replies
+                                // Topic feed - Show replies
                                 case bbp_get_topic_post_type() :