Changeset 12349 for trunk/src/bp-core/bp-core-filters.php

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.

File:

• trunk/src/bp-core/bp-core-filters.php (modified) (3 diffs)

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.