Ticket #5466: 5466.patch

bp-core/bp-core-filters.php

@@ -249 +249 @@
  */
 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() )
+                return $welcome_email;
+
         // Don't touch the email if we don't have a custom registration template
         if ( ! bp_has_custom_signup_page() )
                 return $welcome_email;
@@ -275 +279 @@
  */
 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() )
+                return $welcome_email;
+
         // Don't touch the email if we don't have a custom registration template
         if ( ! bp_has_custom_signup_page() )
                 return $welcome_email;