<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13686] trunk/src/bp-core: Initialize the support of BP block only Themes</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13686">13686</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13686","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-01 10:56:10 +0000 (Mon, 01 Jan 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 {U+01F942}
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8900">#8900</a>
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</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreactionsphp">trunk/src/bp-core/bp-core-actions.php</a></li>
<li><a href="#trunksrcbpcorebpcorecatchuriphp">trunk/src/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplateloaderphp">trunk/src/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#trunksrcbpcorebpcorethemecompatibilityphp">trunk/src/bp-core/bp-core-theme-compatibility.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-actions.php 2023-12-31 07:36:34 UTC (rev 13685)
+++ trunk/src/bp-core/bp-core-actions.php 2024-01-01 10:56:10 UTC (rev 13686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,6 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add the BuddyPress functions file and the Theme Compat Default features.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_after_setup_theme', 'bp_check_theme_template_pack_dependency', -10 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'bp_after_setup_theme', 'bp_set_block_theme_compat', 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_after_setup_theme', 'bp_load_theme_functions', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_after_setup_theme', 'bp_register_theme_compat_default_features', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-catchuri.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-catchuri.php 2023-12-31 07:36:34 UTC (rev 13685)
+++ trunk/src/bp-core/bp-core-catchuri.php 2024-01-01 10:56:10 UTC (rev 13686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,6 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * wp-content/themes/[activated_theme]/members/index.php
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 14.0.0 Uses `locate_block_template()` to support BuddyPress Block only Themes.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $templates Array of templates to attempt to load.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,8 +95,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only perform template lookup for bp-default themes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_use_theme_compat_with_current_theme() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template = locate_template( (array) $filtered_templates, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( bp_theme_compat_is_block_theme() ) {
+ // Prevent BuddyPress components from using the BP Theme Compat feature.
+ remove_all_actions( 'bp_setup_theme_compat' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Theme compat doesn't require a template lookup.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $template = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $located_template = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $located_template ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $located_template ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Template was located, lets set this as a valid page and not a 404.
</span><span class="cx" style="display: block; padding: 0 10px"> status_header( 200 );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->is_page = true;
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplateloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-template-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-template-loader.php 2023-12-31 07:36:34 UTC (rev 13685)
+++ trunk/src/bp-core/bp-core-template-loader.php 2024-01-01 10:56:10 UTC (rev 13686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -826,3 +826,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'index.php'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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 );
+ }
+}
</ins></span></pre></div>
<a id="trunksrcbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-theme-compatibility.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-theme-compatibility.php 2023-12-31 07:36:34 UTC (rev 13685)
+++ trunk/src/bp-core/bp-core-theme-compatibility.php 2024-01-01 10:56:10 UTC (rev 13686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1041,3 +1041,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>