Changeset 13692

Timestamp:

01/13/2024 09:45:16 AM (11 months ago)

Author:

imath

Message:

Make sure a random email is previewed when customizing BP Emails

[13689] introduced a side effect with the BP Email customization feature. Instead of showing a random Email it was showing the site’s home page when a BP Directory was set as the site's front page. This change is making sure a random BP Email will be previewed even if a BP Directory is the site's front page.

A deprecated notice with WordPress 6.4 has also been resolved and a warning notice has been reported upstream as, to our point of view, the WP Customizer shouldn't load the widgets component when a Block Theme is used for the site. See ​WP60236.

Props emaralive

See #9056 (trunk)
Closes ​https://github.com/buddypress/buddypress/pull/215

Location:

trunk/src

Files:

• bp-core/bp-core-template.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php (modified) (1 diff)
• bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php (modified) (1 diff)

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

@@ -1937 +1937 @@
     $home_url      = home_url( '/' );
 
-    if ( is_customize_preview() ) {
+    if ( is_customize_preview() && ! bp_is_email_customizer() ) {
         $requested_url = wp_parse_url( $requested_url, PHP_URL_PATH );
         $home_url      = wp_parse_url( $home_url, PHP_URL_PATH );
@@ -3782 +3782 @@
 
 /**
+ * Outputs the BP Email's template footer.
+ *
+ * @since 12.1.0
+ */
+function bp_email_footer() {
+    // `the_block_template_skip_link()` was deprecated in WP 6.4.0.
+    if ( bp_is_running_wp( '6.4.0', '>=' ) && has_action( 'wp_footer', 'the_block_template_skip_link' ) ) {
+        remove_action( 'wp_footer', 'the_block_template_skip_link' );
+    }
+
+    wp_footer();
+}
+
+/**
  * Checks if a Widget/Block is active.
  *

trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php

@@ -241 +241 @@
     </center>
 </td></tr></table>
-<?php if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) wp_footer(); ?>
+<?php if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) bp_email_footer(); ?>
 </body>
 </html>

trunk/src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php

@@ -243 +243 @@
 <?php
 if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) {
-    wp_footer();
+    bp_email_footer();
 }
 ?>