<!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][13145] trunk/src: WP FSE Compat: make sure BuddyPress templates are loaded on front-end</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/13145">13145</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/13145","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>2021-11-13 14:33:37 +0000 (Sat, 13 Nov 2021)</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'>WP FSE Compat: make sure BuddyPress templates are loaded on front-end
Adapt the BuddyPress Theme Compat API so that it uses the WordPress block template canvas when the active theme supports block templates. You can now test BuddyPress inside Twenty Twenty-Two: the next WordPress default theme!
Improves the BP Nouveau Template Pack introducing a new function `bp_nouveau_get_theme_layout_widths()` to get the theme layout available widths and use the wider one by default.
See <a href="http://buddypress.trac.wordpress.org/ticket/8474">#8474</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretemplateloaderphp">trunk/src/bp-core/bp-core-template-loader.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressfunctionsphp">trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludescustomizerphp">trunk/src/bp-templates/bp-nouveau/includes/customizer.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludestemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2021-11-08 20:29:20 UTC (rev 13144)
+++ trunk/src/bp-core/bp-core-template-loader.php 2021-11-13 14:33:37 UTC (rev 13145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,12 +453,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = apply_filters( "bp_get_{$type}_template", $templates );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Filter possible templates, try to match one, and set any BuddyPress theme
- // compat properties so they can be cross-checked later.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Filter possible templates, try to match one, and set any BuddyPress theme
+ * compat properties so they can be cross-checked later.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $templates = bp_set_theme_compat_templates( $templates );
</span><span class="cx" style="display: block; padding: 0 10px"> $template = bp_locate_template( $templates );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $template = bp_set_theme_compat_template( $template );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The current theme is using the WordPress Full Site Editing feature.
+ * BuddyPress then needs to use the WordPress template canvas to retrieve the community content.
+ */
+ if ( current_theme_supports( 'block-templates' ) && $template === get_theme_file_path( 'index.php' ) ) {
+ $template = ABSPATH . WPINC . '/template-canvas.php';
+ }
+
+ $template = bp_set_theme_compat_template( $template );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the path to a template file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2021-11-08 20:29:20 UTC (rev 13144)
+++ trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2021-11-13 14:33:37 UTC (rev 13145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,12 +176,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to neutralize the BuddyPress core "bp_core_render_message()" once it has been added.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_actions', array( $this, 'neutralize_core_template_notices' ), 6 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Scripts.
- add_action( 'bp_enqueue_scripts', array( $this, 'register_scripts' ), 2 ); // Register theme JS.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Scripts & Styles.
+ $registration_params = array(
+ 'hook' => 'bp_enqueue_scripts',
+ 'priority' => 2,
+ );
+
+ /*
+ * The WordPress Full Site Editing feature needs Scripts
+ * and Styles to be registered earlier.
+ */
+ if ( current_theme_supports( 'block-templates' ) ) {
+ $registration_params['hook'] = 'bp_init';
+ $registration_params['priority'] = 20;
+ }
+
+ // Register theme JS.
+ add_action( $registration_params['hook'], array( $this, 'register_scripts' ), $registration_params['priority'] );
+
+ // Enqueue theme CSS.
+ add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+
+ // Enqueue theme JS.
+ add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+
+ // Enqueue theme script localization.
+ add_filter( 'bp_enqueue_scripts', array( $this, 'localize_scripts' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'bp_enqueue_scripts', 'bp_core_confirmation_js' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); // Enqueue theme CSS.
- add_action( 'bp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); // Enqueue theme JS.
- add_filter( 'bp_enqueue_scripts', array( $this, 'localize_scripts' ) ); // Enqueue theme script localization.
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Body no-js class.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludescustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2021-11-08 20:29:20 UTC (rev 13144)
+++ trunk/src/bp-templates/bp-nouveau/includes/customizer.php 2021-11-13 14:33:37 UTC (rev 13145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Code to hook into the WP Customizer
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 10.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( trailingslashit( bp_nouveau()->includes_dir ) . 'customizer-controls.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->register_control_type( 'BP_Nouveau_Nav_Customize_Control' );
</span><span class="cx" style="display: block; padding: 0 10px"> $bp_nouveau_options = bp_nouveau_get_appearance_settings();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $layout_widths = bp_nouveau_get_theme_layout_widths();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_panel( 'bp_nouveau_panel', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Customize the appearance of BuddyPress Nouveau Template pack.', 'buddypress' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</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 ( current_theme_supports( 'align-wide' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $layout_widths ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings['bp_nouveau_appearance[global_alignment]'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'index' => 'global_alignment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability' => 'bp_moderate',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,17 +307,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $controls = apply_filters( 'bp_nouveau_customizer_controls', $controls );
</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 ( current_theme_supports( 'align-wide' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $layout_widths ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $controls['global_alignment'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Select the BuddyPress container width for your site.', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'bp_nouveau_general_settings',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'bp_nouveau_appearance[global_alignment]',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'choices' => array(
- 'alignnone' => __( 'Default width', 'buddypress' ),
- 'alignwide' => __( 'Wide width', 'buddypress' ),
- 'alignfull' => __( 'Full width', 'buddypress' ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'choices' => $layout_widths,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/functions.php 2021-11-08 20:29:20 UTC (rev 13144)
+++ trunk/src/bp-templates/bp-nouveau/includes/functions.php 2021-11-13 14:33:37 UTC (rev 13145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Common functions
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 9.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 10.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,3 +1639,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $widget_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Retuns the theme layout available widths.
+ *
+ * @since 10.0.0
+ *
+ * @return array The available theme layout widths.
+ */
+function bp_nouveau_get_theme_layout_widths() {
+ $layout_widths = array();
+
+ if ( current_theme_supports( 'align-wide' ) ) {
+ $layout_widths = array(
+ 'alignnone' => __( 'Default width', 'buddypress' ),
+ 'alignwide' => __( 'Wide width', 'buddypress' ),
+ 'alignfull' => __( 'Full width', 'buddypress' ),
+ );
+ }
+
+ // `wp_get_global_settings()` has been introduced in WordPress 5.9
+ if ( function_exists( 'wp_get_global_settings' ) ) {
+ $theme_layouts = wp_get_global_settings( array( 'layout' ) );
+
+ if ( isset( $theme_layouts['wideSize'] ) && $theme_layouts['wideSize'] ) {
+ $layout_widths = array(
+ 'alignnone' => __( 'Content width', 'buddypress' ),
+ 'alignwide' => __( 'Wide width', 'buddypress' ),
+ );
+ }
+ }
+
+ /**
+ * Filter here to edit the available theme layout widths.
+ *
+ * @since 10.0.0
+ *
+ * @param array $layout_widths The available theme layout widths.
+ */
+ return apply_filters( 'bp_nouveau_get_theme_layout_widths', $layout_widths );
+}
</ins></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludestemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2021-11-08 20:29:20 UTC (rev 13144)
+++ trunk/src/bp-templates/bp-nouveau/includes/template-tags.php 2021-11-13 14:33:37 UTC (rev 13145)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Common template tags
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 8.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 10.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1529,8 +1529,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">- $global_alignment = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
- if ( $global_alignment && 'alignnone' !== $global_alignment && current_theme_supports( 'align-wide' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_alignment = bp_nouveau_get_temporary_setting( 'global_alignment', bp_nouveau_get_appearance_settings( 'global_alignment' ) );
+ $layout_widths = bp_nouveau_get_theme_layout_widths();
+
+ if ( $global_alignment && 'alignnone' !== $global_alignment && $layout_widths ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = $global_alignment;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>