Changeset 10479 for trunk/src/bp-members/bp-members-functions.php

Timestamp:

01/27/2016 09:15:07 PM (11 years ago)

Author:

djpaul

Message:

Emails: refactor notification functions and use bp_send_email to send email.

Backwards compatibility is mostly maintained, though there are a few unavoidable instances where some data passed to filters is no longer sent (an empty string or equivalent is provided to avoid PHP Notices). These will be detailed in a post on bpdevel.wordpress.com in the feature to alert plugin developers.

See #6592. Props timersys, mercime, boonebgorges, hnla, DJPaul.

File:

• trunk/src/bp-members/bp-members-functions.php (modified) (1 diff)

trunk/src/bp-members/bp-members-functions.php

@@ -2205 +2205 @@
  */
 function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
-        $activate_url = trailingslashit( bp_get_activation_page() ) . "{$key}/";
-        $activate_url = esc_url( $activate_url );
-
-        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
-        $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
-
-        /**
-         * Filters the user email that the validation email will be sent to.
-         *
-         * @since 1.5.0
-         *
-         * @param string $user_email User email the notification is being sent to.
-         * @param int    $user_id    ID of the new user receiving email.
-         */
-        $to      = apply_filters( 'bp_core_signup_send_validation_email_to',     $user_email, $user_id                );
-
-        /**
-         * Filters the validation email subject that will be sent to user.
-         *
-         * @since 1.5.0
-         *
-         * @param string $subject Email validation subject text.
-         * @param int    $user_id ID of the new user receiving email.
-         */
-        $subject = apply_filters( 'bp_core_signup_send_validation_email_subject', $subject,    $user_id                );
-
-        /**
-         * Filters the validation email message that will be sent to user.
-         *
-         * @since 1.5.0
-         *
-         * @param string $message      Email validation message text.
-         * @param int    $user_id      ID of the new user receiving email.
-         * @param string $activate_url URL to use for activating account.
-         */
-        $message = apply_filters( 'bp_core_signup_send_validation_email_message', $message,    $user_id, $activate_url );
-
-        wp_mail( $to, $subject, $message );
-
-        /**
-         * Fires after the sending of activation email to a newly registered user.
-         *
-         * @since 1.5.0
-         *
-         * @param string $subject    Subject for the sent email.
-         * @param string $message    Message for the sent email.
-         * @param int    $user_id    ID of the new user.
-         * @param string $user_email Email address of the new user.
-         * @param string $key        Activation key.
-         */
-        do_action( 'bp_core_sent_user_validation_email', $subject, $message, $user_id, $user_email, $key );
+        $args = array(
+                'tokens' => array(
+                        'activate_url' => esc_url( trailingslashit( bp_get_activation_page() ) . "{$key}/" ),
+                        'key'          => $key,
+                        'user'         => '',
+                        'user.email'   => $user_email,
+                        'user.id'      => $user_id,
+                ),
+        );
+        bp_send_email( 'core-user-registration', $user_id, $args );
 }