Changeset 7425

Timestamp:

09/04/2026 09:28:44 AM (2 weeks ago)

Author:

johnjamesjacoby

Message:

Core - Theme Compat: backport corrected Block Theme support.\n\nUse the WordPress template canvas only for true Block Themes. Classic PHP themes that include theme.json continue loading their bbPress template.\n\nAdd the filterable canvas-template helper and regression coverage for classic, hybrid, Block, and child themes. This mirrors the BuddyPress correction for the same regression.\n\nIn branches/2.6, for 2.6.16.\n\nProps obenland.\nSee #3487.\nFixes #3675.\nSee ​https://buddypress.trac.wordpress.org/ticket/8757.

Location:

branches/2.6

Files:

• src/includes/core/template-loader.php (modified) (1 diff)
• src/includes/core/theme-compat.php (modified) (2 diffs)
• tests/phpunit/data (added)
• tests/phpunit/data/themes (added)
• tests/phpunit/data/themes/bbp-block-child-theme (added)
• tests/phpunit/data/themes/bbp-block-child-theme/style.css (added)
• tests/phpunit/data/themes/bbp-block-theme (added)
• tests/phpunit/data/themes/bbp-block-theme/style.css (added)
• tests/phpunit/data/themes/bbp-block-theme/templates (added)
• tests/phpunit/data/themes/bbp-block-theme/templates/index.html (added)
• tests/phpunit/data/themes/bbp-block-theme/theme.json (added)
• tests/phpunit/data/themes/bbp-classic-child-theme (added)
• tests/phpunit/data/themes/bbp-classic-child-theme/style.css (added)
• tests/phpunit/data/themes/bbp-classic-hybrid-theme (added)
• tests/phpunit/data/themes/bbp-classic-hybrid-theme/index.php (added)
• tests/phpunit/data/themes/bbp-classic-hybrid-theme/style.css (added)
• tests/phpunit/data/themes/bbp-classic-hybrid-theme/theme.json (added)
• tests/phpunit/data/themes/bbp-classic-theme (added)
• tests/phpunit/data/themes/bbp-classic-theme-json (added)
• tests/phpunit/data/themes/bbp-classic-theme-json/bbpress.php (added)
• tests/phpunit/data/themes/bbp-classic-theme-json/index.php (added)
• tests/phpunit/data/themes/bbp-classic-theme-json/style.css (added)
• tests/phpunit/data/themes/bbp-classic-theme-json/theme.json (added)
• tests/phpunit/data/themes/bbp-classic-theme/index.php (added)
• tests/phpunit/data/themes/bbp-classic-theme/style.css (added)
• tests/phpunit/testcases/core/theme-compat.php (added)

branches/2.6/src/includes/core/template-loader.php

@@ -471 +471 @@
         return bbp_get_query_template( 'bbpress', $templates );
 }
+
+/**
+ * Get the theme canvas template, used for Block Themes.
+ *
+ * @since 2.6.16 bbPress
+ *
+ * @return string Path to canvas file.
+ */
+function bbp_get_theme_canvas_template() {
+
+        // Default WordPress Canvas
+        $template = ABSPATH . WPINC . '/template-canvas.php';
+
+        // Filter & return
+        return apply_filters( 'bbp_get_theme_canvas_template', $template );
+}

branches/2.6/src/includes/core/theme-compat.php

@@ -478 +478 @@
  *
  * @since 2.0.0 bbPress (r3032)
+ * @since 2.6.16 bbPress Added support for Block Themes
  *
  * @param string $template
@@ -844 +845 @@
                 bbp_remove_all_filters( 'the_content' );
 
-                $template = bbp_get_theme_compat_templates();
+                // Block themes
+                if ( wp_is_block_theme() ) {
+                        $template = bbp_get_theme_canvas_template();
+
+                // Non-block themes
+                } else {
+                        $template = bbp_get_theme_compat_templates();
+                }
         }