Changeset 10598

Timestamp:

02/16/2016 03:37:51 PM (9 years ago)

Author:

djpaul

Message:

Emails: reinstate missing filters for backwards compatibility.

The user registration and site registration functions (multisite and non-multisite paths) were consolidated as part of the email implementation in 2.5, but the different filter names were overlooked.
This change will restore compatibility for those old actions.

Fixes #6917

Props imath

File:

• trunk/src/bp-core/deprecated/2.5.php (modified) (4 diffs)

trunk/src/bp-core/deprecated/2.5.php

@@ -205 +205 @@
 
     } 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' ) {
             /**
@@ -219 +234 @@
              * @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' ) {
@@ -234 +249 @@
              * @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' ) {
@@ -249 +264 @@
              * @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() );
         }