Changeset 10597

Timestamp:

02/16/2016 02:17:57 PM (10 years ago)

Author:

djpaul

Message:

Emails: for user/site registrations emails, set recipient name to their user_login.

For multisite and for BP_SIGNUPS_SKIP_USER_CREATION , when the user account isn't created yet, we can't fetch the user's display name. Instead, use their user_login name in the email greeting.

Fixes #6913

Props imath

Location:

trunk/src

Files:

• bp-core/bp-core-filters.php (modified) (2 diffs)
• bp-members/bp-members-functions.php (modified) (3 diffs)
• bp-members/classes/class-bp-signup.php (modified) (1 diff)

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

@@ -465 +465 @@
                 ),
         );
-        bp_send_email( 'core-user-registration-with-blog', $user_email, $args );
+        bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $user ) ), $args );
 
         // Return false to stop the original WPMU function from continuing.
@@ -520 +520 @@
                 ),
         );
-        bp_send_email( 'core-user-registration', $user_email, $args );
+        bp_send_email( 'core-user-registration', array( array( $user_email => $user ) ), $args );
 
         // Return false to stop the original WPMU function from continuing.

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

@@ -1840 +1840 @@
                  */
                 if ( apply_filters( 'bp_core_signup_send_activation_key', true, $user_id, $user_email, $activation_key, $usermeta ) ) {
-                        bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
+                        bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key, $user_login );
                 }
         }
@@ -2200 +2200 @@
  * Send activation email to a newly registered user.
  *
- * @param int    $user_id    ID of the new user.
- * @param string $user_email Email address of the new user.
- * @param string $key        Activation key.
- */
-function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
+ * @since  2.5.0 Add the $user_login parameter.
+ *
+ * @param int|bool $user_id    ID of the new user, false if BP_SIGNUPS_SKIP_USER_CREATION is true.
+ * @param string   $user_email Email address of the new user.
+ * @param string   $key        Activation key.
+ * @param string   $user_login Optional. The user login name.
+ */
+function bp_core_signup_send_validation_email( $user_id, $user_email, $key, $user_login = '' ) {
         $args = array(
                 'tokens' => array(
@@ -2214 +2217 @@
                 ),
         );
-        bp_send_email( 'core-user-registration', $user_id, $args );
+
+        if ( $user_id ) {
+                $to = $user_id;
+        } else {
+                $to = array( array( $user_email => $user_login ) );
+        }
+
+        bp_send_email( 'core-user-registration', $to, $args );
 }
 

trunk/src/bp-members/classes/class-bp-signup.php

@@ -587 +587 @@
                                 // Send the validation email.
                                 } else {
-                                        bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key );
+                                        bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key, $signup->user_login );
                                 }
                         }