Changeset 12349

Timestamp:

03/01/2019 02:33:56 AM (6 years ago)

Author:

boonebgorges

Message:

Use display name as salutation in signup emails.

Previously, the user login was used, because the display name was not
yet saved in the database. However, we can generally extract the user's
provided display name from the signup's meta fields.

Fixes #8056.

Location:

trunk/src

Files:

• bp-core/bp-core-filters.php (modified) (3 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

@@ -470 +470 @@
         ),
     );
-    bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $user ) ), $args );
+
+    $signups = BP_Signup::get(
+        array(
+            'user_login' => $user,
+        )
+    );
+
+    $salutation = $user;
+    if ( $signups ) {
+        $signup = $signups['signups'][0];
+        if ( isset( $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+            $salutation = $signup->meta[ 'field_' . bp_xprofile_fullname_field_id() ];
+        }
+    }
+
+    bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $salutation ) ), $args );
 
     // Return false to stop the original WPMU function from continuing.
@@ -522 +537 @@
     if ( $user_object ) {
         $user_id = $user_object->ID;
+    }
+
+    $salutation = $user;
+    if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+        $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
+    } elseif ( $user_id ) {
+        $salutation = bp_core_get_user_displayname( $user_id );
     }
 
@@ -532 +554 @@
         ),
     );
-    bp_send_email( 'core-user-registration', array( array( $user_email => $user ) ), $args );
+    bp_send_email( 'core-user-registration', array( array( $user_email => $salutation ) ), $args );
 
     // Return false to stop the original WPMU function from continuing.

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

@@ -1742 +1742 @@
          */
         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, $user_login );
+            $salutation = $user_login;
+            if ( isset( $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+                $salutation = $usermeta[ 'field_' . bp_xprofile_fullname_field_id() ];
+            }
+
+            bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key, $salutation );
         }
     }
@@ -2159 +2164 @@
  * @since 1.2.2
  * @since 2.5.0 Add the $user_login parameter.
+ * @since 5.0.0 Change $user_login parameter to more general $salutation.
  *
  * @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 = '' ) {
+ * @param string   $user_email   Email address of the new user.
+ * @param string   $key          Activation key.
+ * @param string   $salutation   Optional. The name to be used as a salutation in the email.
+ */
+function bp_core_signup_send_validation_email( $user_id, $user_email, $key, $salutation = '' ) {
     $args = array(
         'tokens' => array(
@@ -2175 +2181 @@
     );
 
-    if ( $user_id ) {
-        $to = $user_id;
-    } else {
-        $to = array( array( $user_email => $user_login ) );
-    }
+    $to = array( array( $user_email => $salutation ) );
 
     bp_send_email( 'core-user-registration', $to, $args );

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

@@ -640 +640 @@
                 // Send the validation email.
                 } else {
-                    bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key, $signup->user_login );
+                    $salutation = $signup->user_login;
+                    if ( isset( $meta[ 'field_' . bp_xprofile_fullname_field_id() ] ) ) {
+                        $salutation = $meta[ 'field_' . bp_xprofile_fullname_field_id() ];
+                    }
+
+                    bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key, $salutation );
                 }
             }