Changeset 13763

Timestamp:

03/09/2024 10:59:45 AM (2 years ago)

Author:

imath

Message:

BP Standalone Block Themes: adapt Members template hierarchy

• Adds a members/single/index.html root template to the BP Standalone Theme hierarchy to be used by BP Standalone Block Themes in respect of WP Block Themes templating logic.
• Adds a members/register root template to the BP Standalone Theme hierarchy to be used by BP Standalone Block Themes in respect of WP Block Themes templating logic.
• Adds a members/activate root template to the BP Standalone Theme hierarchy to be used by BP Standalone Block Themes in respect of WP Block Themes templating logic.

See #9118
See ​https://github.com/buddypress/buddypress/pull/249
See ​https://github.com/buddypress/buddyvibes/pull/7

Location:

trunk/src/bp-members/screens

Files:

• activate.php (modified) (3 diffs)
• change-avatar.php (modified) (4 diffs)
• change-cover-image.php (modified) (2 diffs)
• invitations.php (modified) (2 diffs)
• profile.php (modified) (1 diff)
• register.php (modified) (1 diff)

trunk/src/bp-members/screens/activate.php

@@ -12 +12 @@
  *
  * @since 1.1.0
+ *
+ * @return void
  */
 function bp_core_screen_activation() {
@@ -17 +19 @@
         // Bail if not viewing the activation page.
         if ( ! bp_is_current_component( 'activate' ) ) {
-                return false;
+                return;
         }
 
@@ -53 +55 @@
          * @since 1.1.1
          *
-         * @param string $value Path to the Member activation template to load.
+         * @param string[] $value Path to the list of Member activation template to load.
          */
-        bp_core_load_template( apply_filters( 'bp_core_template_activate', array( 'activate', 'registration/activate' ) ) );
+        $templates   = apply_filters( 'bp_core_template_activate', array( 'activate', 'registration/activate' ) );
+        $templates[] = 'members/activate';
+
+        bp_core_load_template( $templates );
 }
 add_action( 'bp_screens', 'bp_core_screen_activation' );

trunk/src/bp-members/screens/change-avatar.php

@@ -12 +12 @@
  *
  * @since 6.0.0
+ *
+ * @return void
  */
 function bp_members_screen_change_avatar() {
         // Bail if not the correct screen.
         if ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) {
-                return false;
+                return;
         }
 
@@ -33 +35 @@
         $bp->avatar_admin->step = 'upload-image';
 
-        if ( !empty( $_FILES ) ) {
+        if ( ! empty( $_FILES ) ) {
 
                 // Check the nonce.
@@ -100 +102 @@
         do_action( 'bp_members_screen_change_avatar' );
 
-        /** This filter is documented in wp-includes/deprecated.php */
-        $template = apply_filters_deprecated( 'xprofile_template_change_avatar', array( 'members/single/home' ), '6.0.0', 'bp_members_template_change_avatar' );
+        $templates = array(
+                /** This filter is documented in wp-includes/deprecated.php */
+                apply_filters_deprecated( 'xprofile_template_change_avatar', array( 'members/single/home' ), '6.0.0', 'bp_members_template_change_avatar' ),
+                'members/single/index'
+        );
 
         /**
@@ -108 +113 @@
          * @since 6.0.0
          *
-         * @param string $template Path to the Member template to load.
+         * @param string[] $templates Path to the Member templates to load.
          */
-        bp_core_load_template( apply_filters( 'bp_members_template_change_avatar', $template ) );
+        bp_core_load_template( apply_filters( 'bp_members_template_change_avatar', $templates ) );
 }

trunk/src/bp-members/screens/change-cover-image.php

@@ -29 +29 @@
         do_action( 'bp_members_screen_change_cover_image' );
 
-        /** This filter is documented in wp-includes/deprecated.php */
-        $template = apply_filters_deprecated( 'xprofile_template_cover_image', array( 'members/single/home' ), '6.0.0', 'bp_members_template_change_cover_image' );
+        $templates = array(
+                /** This filter is documented in wp-includes/deprecated.php */
+                apply_filters_deprecated( 'xprofile_template_cover_image', array( 'members/single/home' ), '6.0.0', 'bp_members_template_change_cover_image' ),
+                'members/single/index',
+        );
 
         /**
@@ -37 +40 @@
          * @since 6.0.0
          *
-         * @param string $template Path to the Member template to load.
+         * @param string[] $templates Path to the list of Member templates to load.
          */
-        bp_core_load_template( apply_filters( 'bp_members_template_change_cover_image', $template ) );
+        bp_core_load_template( apply_filters( 'bp_members_template_change_cover_image', $templates ) );
 }

trunk/src/bp-members/screens/invitations.php

@@ -52 +52 @@
         do_action( 'members_screen_send_invites' );
 
-        /**
-         * Filters the template used to display the send membership invitations page.
-         *
-         * @since 8.0.0
-         *
-         * @param string $template Path to the send membership invitations template to load.
-         */
-        bp_core_load_template( apply_filters( 'members_template_send_invites', 'members/single/invitations' ) );
+        $templates = array(
+                /**
+                 * Filters the template used to display the send membership invitations page.
+                 *
+                 * @since 8.0.0
+                 *
+                 * @param string $template Path to the send membership invitations template to load.
+                 */
+                apply_filters( 'members_template_send_invites', 'members/single/home' ),
+                'members/single/index',
+        );
+
+        bp_core_load_template( $templates );
 }
 
@@ -113 +118 @@
         do_action( 'members_screen_list_sent_invites' );
 
-        /**
-         * Filters the template used to display the send membership invitations page.
-         *
-         * @since 8.0.0
-         *
-         * @param string $template Path to the send membership invitations template to load.
-         */
-        bp_core_load_template( apply_filters( 'members_template_list_sent_invites', 'members/single/invitations' ) );
+        $templates = array(
+                /**
+                 * Filters the template used to display the send membership invitations page.
+                 *
+                 * @since 8.0.0
+                 *
+                 * @param string $template Path to the send membership invitations template to load.
+                 */
+                apply_filters( 'members_template_list_sent_invites', 'members/single/home' ),
+                'members/single/index',
+        );
+
+        bp_core_load_template( $templates );
 }

trunk/src/bp-members/screens/profile.php

@@ -22 +22 @@
         do_action( 'bp_members_screen_display_profile' );
 
-        /**
-         * Filters the template to load for the Member profile page screen.
-         *
-         * @since 1.5.0
-         *
-         * @param string $template Path to the Member template to load.
-         */
-        bp_core_load_template( apply_filters( 'bp_members_screen_display_profile', 'members/single/home' ) );
+        $templates = array(
+                /**
+                 * Filters the template to load for the Member profile page screen.
+                 *
+                 * @since 1.5.0
+                 *
+                 * @param string $template Path to the Member template to load.
+                 */
+                apply_filters( 'bp_members_screen_display_profile', 'members/single/home' ),
+                'members/single/index',
+        );
+
+        bp_core_load_template( $templates );
 }

trunk/src/bp-members/screens/register.php

@@ -293 +293 @@
          * @since 1.5.0
          *
-         * @param string $value Path to the Member registration template to load.
+         * @param string[] $value Path to the list of Member registration templates to load.
          */
-        bp_core_load_template( apply_filters( 'bp_core_template_register', array( 'register', 'registration/register' ) ) );
+        $templates   = apply_filters( 'bp_core_template_register', array( 'register', 'registration/register' ) );
+        $templates[] = 'members/register';
+
+        bp_core_load_template( $templates );
 }
 add_action( 'bp_screens', 'bp_core_screen_signup' );