Ticket #6917: 6917.patch

src/bp-core/deprecated/2.5.php

@@ -204 +204 @@
                 }
 
         } elseif ( $email_type === 'core-user-registration' ) {
+                // Filters are different according to the WordPress config.
+                if ( is_multisite() ) {
+                        $registration_filters = array(
+                                'to'      => 'bp_core_activation_signup_user_notification_to',
+                                'subject' => 'bp_core_activation_signup_user_notification_subject',
+                                'content' => 'bp_core_activation_signup_user_notification_message',
+                        );
+                } else {
+                        $registration_filters = array(
+                                'to'      => 'bp_core_signup_send_validation_email_to',
+                                'subject' => 'bp_core_signup_send_validation_email_subject',
+                                'content' => 'bp_core_signup_send_validation_email_message',
+                        );
+                }
+
                 if ( $property === 'to' ) {
                         /**
                          * Filters the email that the notification is going to upon successful registration without blog.
@@ -218 +233 @@
                          * @param string $key            The activation key created in wpmu_signup_blog().
                          * @param array $meta            Removed in 2.5; now an empty array.
                          */
-                        $value = apply_filters( 'bp_core_activation_signup_user_notification_to', $value, $tokens['recipient.name'], $value, $tokens['key'], array() );
+                        $value = apply_filters( $registration_filters['to'], $value, $tokens['recipient.name'], $value, $tokens['key'], array() );
 
                 } elseif ( $property === 'subject' ) {
                         /**
@@ -233 +248 @@
                          * @param string $key             The activation key created in wpmu_signup_blog().
                          * @param array $meta             Removed in 2.5; now an empty array.
                          */
-                        $value = apply_filters( 'bp_core_activation_signup_user_notification_subject', $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
+                        $value = apply_filters( $registration_filters['subject'], $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
 
                 } elseif ( $property === 'content' ) {
                         /**
@@ -248 +263 @@
                          * @param string $key             The activation key created in wpmu_signup_blog().
                          * @param array $meta             Removed in 2.5; now an empty array.
                          */
-                        $value = apply_filters( 'bp_core_activation_signup_user_notification_message', $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
+                        $value = apply_filters( $registration_filters['content'], $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
                 }
 
         } elseif ( $email_type === 'core-user-registration-with-blog' ) {