<!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][10602] trunk/src/bp-core: BP Email: Add global token recipient.username.</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 { 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/10602">10602</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/10602","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-16 19:08:45 +0000 (Tue, 16 Feb 2016)</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'>BP Email: Add global token recipient.username.

* Always populate `recipient.username`
with the user?\226?\128?\153s username (login name).
* Use the new token in the deprecated
actions that are expecting to be passed
the user?\226?\128?\153s username.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefiltersphp">trunk/src/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunksrcbpcoredeprecated25php">trunk/src/bp-core/deprecated/2.5.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     2016-02-16 19:08:40 UTC (rev 10601)
+++ trunk/src/bp-core/bp-core-filters.php       2016-02-16 19:08:45 UTC (rev 10602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1020,10 +1020,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $tokens['site.name']        = wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Default values for tokens set conditionally below.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $tokens['email.preheader'] = '';
-       $tokens['recipient.email'] = '';
-       $tokens['recipient.name']  = '';
-       $tokens['unsubscribe']     = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tokens['email.preheader']     = '';
+       $tokens['recipient.email']     = '';
+       $tokens['recipient.name']      = '';
+       $tokens['recipient.username']  = '';
+       $tokens['unsubscribe']         = '';
</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">        // Who is the email going to?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,6 +1036,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $tokens['recipient.email'] = $recipient->get_address();
</span><span class="cx" style="display: block; padding: 0 10px">                $tokens['recipient.name']  = $recipient->get_name();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( ! $user_obj && $tokens['recipient.email'] ) {
+                       $user_obj = get_user_by( 'email', $tokens['recipient.email'] );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( $user_obj ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // Unsubscribe link.
</span><span class="cx" style="display: block; padding: 0 10px">                        $tokens['unsubscribe'] = esc_url( sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1042,6 +1047,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                bp_core_get_user_domain( $user_obj->ID ),
</span><span class="cx" style="display: block; padding: 0 10px">                                function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings'
</span><span class="cx" style="display: block; padding: 0 10px">                        ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $tokens['recipient.username'] = $user_obj->user_login;
</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>
<a id="trunksrcbpcoredeprecated25php"></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/deprecated/2.5.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/2.5.php      2016-02-16 19:08:40 UTC (rev 10601)
+++ trunk/src/bp-core/deprecated/2.5.php        2016-02-16 19:08:45 UTC (rev 10602)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,14 +226,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value          User email the notification is being sent to.
-                        * @param string $recipient_name The user's login name.
-                        * @param array $value           User email the notification is being sent to (again).
-                        *                               Array key is email address, value is the name.
-                        * @param string $key            The activation key created in wpmu_signup_blog().
-                        * @param array $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              User email the notification is being sent to.
+                        * @param string $recipient_username The user's login name.
+                        * @param array $value               User email the notification is being sent to (again).
+                        *                                   Array key is email address, value is the name.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array $meta                Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( $registration_filters['to'], $value, $tokens['recipient.name'], $value, $tokens['key'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( $registration_filters['to'], $value, $tokens['recipient.username'], $value, $tokens['key'], array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $property === 'subject' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,13 +242,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value           Email notification subject text.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array $meta             Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              Email notification subject text.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array $meta                Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( $registration_filters['subject'], $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( $registration_filters['subject'], $value, $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key'], array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $property === 'content' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,13 +257,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value           The message to use.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array $meta             Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              The message to use.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array $meta                Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( $registration_filters['content'], $value, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( $registration_filters['content'], $value, $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key'], array() );
</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">        } elseif ( $email_type === 'core-user-registration-with-blog' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,16 +274,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value           User email the notification is being sent to.
-                        * @param string $domain          The new blog domain.
-                        * @param string $path            The new blog path.
-                        * @param string $title           The site title.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array  $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              User email the notification is being sent to.
+                        * @param string $domain             The new blog domain.
+                        * @param string $path               The new blog path.
+                        * @param string $title              The site title.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array  $meta               Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( 'bp_core_activation_signup_blog_notification_to', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( 'bp_core_activation_signup_blog_notification_to', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $property === 'subject' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,16 +292,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value           The subject to use.
-                        * @param string $domain          The new blog domain.
-                        * @param string $path            The new blog path.
-                        * @param string $title           The site title.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array  $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              The subject to use.
+                        * @param string $domain             The new blog domain.
+                        * @param string $path               The new blog path.
+                        * @param string $title              The site title.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array  $meta               Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( 'bp_core_activation_signup_blog_notification_subject', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( 'bp_core_activation_signup_blog_notification_subject', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } elseif ( $property === 'content' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,16 +310,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.2.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $value           The message to use.
-                        * @param string $domain          The new blog domain.
-                        * @param string $path            The new blog path.
-                        * @param string $title           The site title.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array  $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $value              The message to use.
+                        * @param string $domain             The new blog domain.
+                        * @param string $path               The new blog path.
+                        * @param string $title              The site title.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array  $meta               Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $value = apply_filters( 'bp_core_activation_signup_blog_notification_message', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $value = apply_filters( 'bp_core_activation_signup_blog_notification_message', $value, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</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">        } elseif ( $email_type === 'friends-request' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -767,15 +767,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                         * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px">                         * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                         *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                         * @param string $admin_email     Admin Email address for the site.
-                        * @param string $email_subject   Subject used in the notification email.
-                        * @param string $email_content   Message used in the notification email.
-                        * @param string $recipient_name  The user's login name.
-                        * @param string $recipient_email The user's email address.
-                        * @param string $key             The activation key created in wpmu_signup_blog().
-                        * @param array  $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                  * @param string $admin_email        Admin Email address for the site.
+                        * @param string $email_subject      Subject used in the notification email.
+                        * @param string $email_content      Message used in the notification email.
+                        * @param string $recipient_username The user's login name.
+                        * @param string $recipient_email    The user's email address.
+                        * @param string $key                The activation key created in wpmu_signup_blog().
+                        * @param array  $meta               Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        do_action( 'bp_core_sent_user_signup_email', bp_get_option( 'admin_email' ), $email_subject, $email_content, $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 do_action( 'bp_core_sent_user_signup_email', bp_get_option( 'admin_email' ), $email_subject, $email_content, $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key'], array() );
</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">        } elseif ( $email_type === 'core-user-registration-with-blog' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,18 +785,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 1.5.0
</span><span class="cx" style="display: block; padding: 0 10px">                 * @deprecated 2.5.0 Use the filters in BP_Email. $meta argument unset and deprecated.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param string $admin_email     Admin Email address for the site.
-                * @param string $email_subject   Subject used in the notification email.
-                * @param string $email_content   Message used in the notification email.
-                * @param string $domain          The new blog domain.
-                * @param string $path            The new blog path.
-                * @param string $title           The site title.
-                * @param string $recipient_name  The user's login name.
-                * @param string $recipient_email The user's email address.
-                * @param string $key             The activation key created in wpmu_signup_blog().
-                * @param array  $meta            Removed in 2.5; now an empty array.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param string $admin_email        Admin Email address for the site.
+                * @param string $email_subject      Subject used in the notification email.
+                * @param string $email_content      Message used in the notification email.
+                * @param string $domain             The new blog domain.
+                * @param string $path               The new blog path.
+                * @param string $title              The site title.
+                * @param string $recipient_username The user's login name.
+                * @param string $recipient_email    The user's email address.
+                * @param string $key                The activation key created in wpmu_signup_blog().
+                * @param array  $meta               Removed in 2.5; now an empty array.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                do_action( 'bp_core_sent_blog_signup_email', bp_get_option( 'admin_email' ), $email_subject, $email_content, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.name'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         do_action( 'bp_core_sent_blog_signup_email', bp_get_option( 'admin_email' ), $email_subject, $email_content, $tokens['domain'], $tokens['path'], $tokens['title'], $tokens['recipient.username'], $tokens['recipient.email'], $tokens['key_blog'], array() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        } elseif ( $email_type === 'friends-request' ) {
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span></span></pre>
</div>
</div>

</body>
</html>