Changeset 13686

Timestamp:

01/01/2024 10:56:10 AM (12 months ago)

Author:

imath

Message:

Initialize the support of BP block only Themes

We are now using the locate_block_template() function to get block templates of BuddyPress content when active theme is supporting buddypress and is only using blocks.

For an example of this new kind of BP Themes, you can check the WIP we've started here: ​https://github.com/buddypress/buddyvibes

Here's a nice way to start 2024! Happy new year to everyone 🥂

Fixes #8900
Closes ​https://github.com/buddypress/buddypress/pull/104

M src/bp-core/bp-core-actions.php
M src/bp-core/bp-core-catchuri.php
M src/bp-core/bp-core-template-loader.php
M src/bp-core/bp-core-theme-compatibility.php

Location:

trunk/src/bp-core

Files:

• bp-core-actions.php (modified) (1 diff)
• bp-core-catchuri.php (modified) (3 diffs)
• bp-core-template-loader.php (modified) (1 diff)
• bp-core-theme-compatibility.php (modified) (1 diff)

trunk/src/bp-core/bp-core-actions.php

@@ -165 +165 @@
  */
 add_action( 'bp_after_setup_theme', 'bp_check_theme_template_pack_dependency',   -10 );
+add_action( 'bp_after_setup_theme', 'bp_set_block_theme_compat',                  0  );
 add_action( 'bp_after_setup_theme', 'bp_load_theme_functions',                    1  );
 add_action( 'bp_after_setup_theme', 'bp_register_theme_compat_default_features',  10 );

trunk/src/bp-core/bp-core-catchuri.php

@@ -70 +70 @@
  *
  * @since 1.0.0
+ * @since 14.0.0 Uses `locate_block_template()` to support BuddyPress Block only Themes.
  *
  * @param array $templates Array of templates to attempt to load.
@@ -95 +96 @@
     // Only perform template lookup for bp-default themes.
     if ( ! bp_use_theme_compat_with_current_theme() ) {
-        $template = locate_template( (array) $filtered_templates, false );
+        if ( bp_theme_compat_is_block_theme() ) {
+            // Prevent BuddyPress components from using the BP Theme Compat feature.
+            remove_all_actions( 'bp_setup_theme_compat' );
+
+            $block_templates = array();
+            foreach ( (array) $templates as $template ) {
+                $block_templates[] = 'buddypress/' . $template;
+            }
+
+            $template_type     = 'buddypress';
+            $block_templates[] = $template_type;
+
+            $template = locate_block_template( '', $template_type, $block_templates );
+
+        } else {
+            $template = locate_template( (array) $filtered_templates, false );
+        }
 
     // Theme compat doesn't require a template lookup.
@@ -124 +141 @@
     }
 
-    if ( !empty( $located_template ) ) {
+    if ( ! empty( $located_template ) ) {
         // Template was located, lets set this as a valid page and not a 404.
         status_header( 200 );

trunk/src/bp-core/bp-core-template-loader.php

@@ -827 +827 @@
     ) );
 }
+
+/**
+ * Sets Block Theme compatibility if it supports BuddyPress.
+ *
+ * @since 14.0.0
+ */
+function bp_set_block_theme_compat() {
+    if ( bp_is_running_wp( '5.9.0', '>=' ) && wp_is_block_theme() && current_theme_supports( 'buddypress' ) ) {
+        bp_deregister_template_stack( 'get_stylesheet_directory', 10 );
+        bp_deregister_template_stack( 'get_template_directory', 12 );
+
+        $block_theme     = wp_get_theme();
+        $theme_compat_id = $block_theme->stylesheet;
+
+        bp_register_theme_package(
+            array(
+                'id'             => $theme_compat_id,
+                'name'           => $block_theme->get( 'Name' ),
+                'version'        => $block_theme->get( 'Version' ),
+                'dir'            => '',
+                'url'            => '',
+                'is_block_theme' => true,
+            )
+        );
+
+        bp_setup_theme_compat( $theme_compat_id );
+    }
+}

trunk/src/bp-core/bp-core-theme-compatibility.php

@@ -1042 +1042 @@
     }
 }
+
+/**
+ * Informs about whether current theme compat is about a block theme.
+ *
+ * @since 14.0.0
+ *
+ * @return boolean True if current theme compat is about a block theme.
+ *                 False otherwise.
+ */
+function bp_theme_compat_is_block_theme() {
+    $theme = buddypress()->theme_compat->theme;
+
+    return isset( $theme->is_block_theme ) && $theme->is_block_theme;
+}