Ticket #8542: 8542.patch

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

@@ -126 +126 @@
         // User has already verified their email by responding to the invitation, so we can activate.
         $key = bp_get_user_meta( $user_id, 'activation_key', true );
         if ( $key ) {
+                $redirect = bp_get_activation_page();
+
                 /**
                  * Filters the activation signup.
                  *
@@ -138 +140 @@
 
                 // If there were errors, add a message and redirect.
                 if ( ! empty( $user->errors ) ) {
+                        /**
+                         * Filter here to redirect the User to a different URL than the activation page.
+                         *
+                         * @since 10.0.0
+                         *
+                         * @param string   $redirect The URL to use to redirect the user.
+                         * @param WP_Error $user     The WP Error object.
+                         */
+                        $redirect = apply_filters( 'bp_members_invitations_activation_errored_redirect', $redirect, $user );
+
                         bp_core_add_message( $user->get_error_message(), 'error' );
-                        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+                        bp_core_redirect( $redirect );
                 }
 
+                /**
+                 * Filter here to redirect the User to a different URL than the activation page.
+                 *
+                 * @since 10.0.0
+                 *
+                 * @param string   $redirect The URL to use to redirect the user.
+                 */
+                $redirect = apply_filters( 'bp_members_invitations_activation_successed_redirect', $redirect );
+
                 bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-                bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
+                bp_core_redirect( add_query_arg( 'activated', '1', $redirect ) );
         }
 }
 add_action( 'bp_core_signup_user', 'bp_members_invitations_complete_signup', 10, 4 );

src/bp-members/screens/activate.php

@@ -85 +85 @@
                 return;
         }
 
-        $bp = buddypress();
+        $bp       = buddypress();
+        $redirect = bp_get_activation_page();
 
         /**
          * Filters the activation signup.
@@ -99 +100 @@
 
         // If there were errors, add a message and redirect.
         if ( ! empty( $user->errors ) ) {
+                /**
+                 * Filter here to redirect the User to a different URL than the activation page.
+                 *
+                 * @since 10.0.0
+                 *
+                 * @param string   $redirect The URL to use to redirect the user.
+                 * @param WP_Error $user     The WP Error object.
+                 */
+                $redirect = apply_filters( 'bp_members_action_activate_errored_redirect', $redirect, $user );
+
                 bp_core_add_message( $user->get_error_message(), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+                bp_core_redirect( $redirect );
         }
 
+        /**
+         * Filter here to redirect the User to a different URL than the activation page.
+         *
+         * @since 10.0.0
+         *
+         * @param string   $redirect The URL to use to redirect the user.
+         */
+        $redirect = apply_filters( 'bp_members_action_activate_successed_redirect', $redirect );
+
         bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-        bp_core_redirect( add_query_arg( 'activated', '1', bp_get_activation_page() ) );
+        bp_core_redirect( add_query_arg( 'activated', '1', $redirect ) );
 
 }
-add_action( 'bp_actions', 'bp_members_action_activate_account' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_members_action_activate_account' );