<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12349] trunk/src: Use display name as salutation in signup emails.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12349">12349</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12349","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-01 02:33:56 +0000 (Fri, 01 Mar 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/8056">#8056</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefiltersphp">trunk/src/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpsignupphp">trunk/src/bp-members/classes/class-bp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-filters.php 2019-02-28 22:37:06 UTC (rev 12348)
+++ trunk/src/bp-core/bp-core-filters.php 2019-03-01 02:33:56 UTC (rev 12349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,8 +469,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user.email' => $user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_send_email( 'core-user-registration-with-blog', array( array( $user_email => $user ) ), $args );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return false to stop the original WPMU function from continuing.
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,6 +538,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = $user_object->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tokens' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activate.url' => esc_url( trailingslashit( bp_get_activation_page() ) . "{$key}/" ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user.id' => $user_id,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_send_email( 'core-user-registration', array( array( $user_email => $user ) ), $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_send_email( 'core-user-registration', array( array( $user_email => $salutation ) ), $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Return false to stop the original WPMU function from continuing.
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2019-02-28 22:37:06 UTC (rev 12348)
+++ trunk/src/bp-members/bp-members-functions.php 2019-03-01 02:33:56 UTC (rev 12349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1741,7 +1741,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * signup data, xprofile data, etc).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( apply_filters( 'bp_core_signup_send_activation_key', true, $user_id, $user_email, $activation_key, $usermeta ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key, $user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2158,13 +2163,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.2
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0 Add the $user_login parameter.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Change $user_login parameter to more general $salutation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int|bool $user_id ID of the new user, false if BP_SIGNUPS_SKIP_USER_CREATION is true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $user_email Email address of the new user.
- * @param string $key Activation key.
- * @param string $user_login Optional. The user login name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_core_signup_send_validation_email( $user_id, $user_email, $key, $user_login = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_core_signup_send_validation_email( $user_id, $user_email, $key, $salutation = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tokens' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'activate.url' => esc_url( trailingslashit( bp_get_activation_page() ) . "{$key}/" ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2174,11 +2180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user_id ) {
- $to = $user_id;
- } else {
- $to = array( array( $user_email => $user_login ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $to = array( array( $user_email => $salutation ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_send_email( 'core-user-registration', $to, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-signup.php 2019-02-28 22:37:06 UTC (rev 12348)
+++ trunk/src/bp-members/classes/class-bp-signup.php 2019-03-01 02:33:56 UTC (rev 12349)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +639,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send the validation email.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_signup_send_validation_email( false, $signup->user_email, $signup->activation_key, $signup->user_login );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>