Ticket #5789: 5789.04.patch

src/bp-core/bp-core-filters.php

@@ -250 +250 @@
 function bp_core_filter_user_welcome_email( $welcome_email ) {
 
         // Don't touch the email when a user is registered by the site admin
-        if ( is_admin() )
+        if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
                 return $welcome_email;
+        }
+
+        if ( strpos( bp_get_requested_url(), 'wp-activate.php' ) !== false ) {
+                return $welcome_email;
+        }
 
         // Don't touch the email if we don't have a custom registration template
-        if ( ! bp_has_custom_signup_page() )
+        if ( ! bp_has_custom_signup_page() ) {
                 return $welcome_email;
+        }
 
         // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
         return str_replace( 'PASSWORD', __( '[User Set]', 'buddypress' ), $welcome_email );
@@ -279 +285 @@
  */
 function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
 
-        // Don't touch the email when a user is registered by the site admin.
-        if ( is_admin() )
+        // Don't touch the email when a user is registered by the site admin
+        if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
                 return $welcome_email;
+        }
 
         // Don't touch the email if we don't have a custom registration template
         if ( ! bp_has_custom_signup_page() )
@@ -351 +358 @@
  */
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
 
+        if ( is_admin() ) {
+                // If the user is created from the WordPress Add User screen, don't send BuddyPress signup notifications
+                if( in_array( get_current_screen()->id, array( 'user', 'user-network' ) ) ) {
+                        // If the Super Admin want to skip confirmation email
+                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+                                return false;
+
+                        // WordPress will manage the signup process
+                        } else {
+                                return $user;
+                        }
+
+                /** 
+                 * There can be a case where the user was created without the skip confirmation
+                 * And the super admin goes in pending accounts to resend it. In this case, as the
+                 * meta['password'] is not set, the activation url must be WordPress one
+                 */
+                } else if ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+                        $is_hashpass_in_meta = maybe_unserialize( $meta );
+
+                        if ( empty( $is_hashpass_in_meta['password'] ) ) {
+                                return $user;
+                        }
+                }
+        }
+
         // Set up activation link
         $activate_url = bp_get_activation_page() . "?key=$key";
         $activate_url = esc_url( $activate_url );