Changeset 5080

Timestamp:

08/19/2013 07:47:49 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Separate content replacement from title replacement in forum and topic archives, allowing pages with matching slugs but empty post_content to replace the_content as expected. Fixes situation where a user creates a "Forums" page and leaves the content empty, expecting bbPress to replace it.

Also use the $page->ID to help "Edit" links to point to the correct post ID.

File:

• trunk/includes/core/theme-compat.php (modified) (2 diffs)

trunk/includes/core/theme-compat.php

@@ -475 +475 @@
         // Page exists where this archive should be
         $page = bbp_get_page_by_path( bbp_get_root_slug() );
-        if ( !empty( $page ) ) {
+
+        // Should we replace the content...
+        if ( empty( $page->post_content ) ) {
+
+            // Use the topics archive
+            if ( 'topics' === bbp_show_on_root() ) {
+                $new_content = $bbp_shortcodes->display_topic_index();
+
+            // No page so show the archive
+            } else {
+                $new_content = $bbp_shortcodes->display_forum_index();
+            }
+
+        // ...or use the existing page content?
+        } else {
             $new_content = apply_filters( 'the_content', $page->post_content );
-            $new_title   = apply_filters( 'the_title',   $page->post_title   );
-
-        // Use the topics archive
-        } elseif ( 'topics' === bbp_show_on_root() ) {
-            $new_content = $bbp_shortcodes->display_topic_index();
-            $new_title   = bbp_get_topic_archive_title();
-
-        // No page so show the archive
+        }
+
+        // Should we replace the title...
+        if ( empty( $page->post_title ) ) {
+
+            // Use the topics archive
+            if ( 'topics' === bbp_show_on_root() ) {
+                $new_title = bbp_get_topic_archive_title();
+
+            // No page so show the archive
+            } else {
+                $new_title = bbp_get_forum_archive_title();
+            }
+
+        // ...or use the existing page title?
         } else {
-            $new_content = $bbp_shortcodes->display_forum_index();
-            $new_title   = bbp_get_forum_archive_title();
+            $new_title = apply_filters( 'the_title',   $page->post_title   );
         }
 
         // Reset post
         bbp_theme_compat_reset_post( array(
-            'ID'             => 0,
+            'ID'             => !empty( $page->ID ) ? $page->ID : 0,
             'post_title'     => $new_title,
             'post_author'    => 0,
@@ -541 +561 @@
         // Page exists where this archive should be
         $page = bbp_get_page_by_path( bbp_get_topic_archive_slug() );
-        if ( !empty( $page ) ) {
+
+        // Should we replace the content...
+        if ( empty( $page->post_content ) ) {
+            $new_content = $bbp_shortcodes->display_topic_index();
+
+        // ...or use the existing page content?
+        } else {
             $new_content = apply_filters( 'the_content', $page->post_content );
-
-        // No page so show the archive
+        }
+
+        // Should we replace the title...
+        if ( empty( $page->post_title ) ) {
+            $new_title = bbp_get_topic_archive_title();
+
+        // ...or use the existing page title?
         } else {
-            $new_content = $bbp_shortcodes->display_topic_index();
+            $new_title = apply_filters( 'the_title',   $page->post_title   );
         }
 
         // Reset post
         bbp_theme_compat_reset_post( array(
-            'ID'             => 0,
+            'ID'             => !empty( $page->ID ) ? $page->ID : 0,
             'post_title'     => bbp_get_topic_archive_title(),
             'post_author'    => 0,