Changeset 4935

Timestamp:

05/20/2013 10:48:51 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Allow topics to replace the forum archive:

• Add condition to bbp_parse_args() and add a specific query variable early, and use this variable in bbp_is_forum_archive().
• Add condition to display_forum_archive() shortcode, to output topics if set.
• Add forum archive check to bbp_has_topics(), to ensure pagination links are correct.
• See #1500.

Location:

trunk/includes

Files:

• common/template-tags.php (modified) (2 diffs)
• core/template-functions.php (modified) (1 diff)
• core/theme-compat.php (modified) (1 diff)
• topics/template-tags.php (modified) (1 diff)

trunk/includes/common/template-tags.php

@@ -146 +146 @@
  */
 function bbp_is_forum_archive() {
+    global $wp_query;
 
     // Default to false
@@ -151 +152 @@
 
     // In forum archive
-    if ( is_post_type_archive( bbp_get_forum_post_type() ) || bbp_is_query_name( 'bbp_forum_archive' ) )
+    if ( is_post_type_archive( bbp_get_forum_post_type() ) || bbp_is_query_name( 'bbp_forum_archive' ) || !empty( $wp_query->bbp_show_topics_on_root ) )
         $retval = true;
 

trunk/includes/core/template-functions.php

@@ -510 +510 @@
         $posts_query->set( 'post_type',      bbp_get_topic_post_type() );
         $posts_query->set( 'posts_per_page', bbp_get_topics_per_page() );
+
+    // Do topics on forums root
+    } elseif ( is_post_type_archive( bbp_get_topic_post_type() ) && ( 'topics' === bbp_show_on_root() ) ) {
+        $posts_query->bbp_show_topics_on_root = true;
     }
 }

trunk/includes/core/theme-compat.php

@@ -751 +751 @@
             add_filter( 'the_content', 'bbp_replace_the_content' );
 
+        // Use the topics archive
+        } elseif ( 'topics' === bbp_show_on_root() ) {
+            $new_content = $bbp->shortcodes->display_topics_index();
+
         // No page so show the archive
         } else {

trunk/includes/topics/template-tags.php

@@ -309 +309 @@
                 $base = get_permalink();
 
+            // Forum archive
+            } elseif ( bbp_is_forum_archive() ) {
+                $base = bbp_get_forums_url();
+
             // Topic archive
             } elseif ( bbp_is_topic_archive() ) {