<!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][10500] trunk/src: Emails: un-deprecate `bp_activity_sent_mention_email` action.</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/10500">10500</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/10500","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-03 19:55:29 +0000 (Wed, 03 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'>Emails: un-deprecate `bp_activity_sent_mention_email` action.
All functions where we send an email trigger a final action after the email's sent. The recent changes for BP 2.5's email overhaul moved all of these into the 2.5 backwards compatibility file, which is triggered by the new "email sent" actions and filters in `bp_send_email()`.
Subsequent investigation of all similar actions revealed that only `bp_activity_sent_mention_email` had core functions hooked to it. Also, `bp_activity_sent_mention_email` was the only action hook that *always* triggered -- the other similar actions did not trigger if the recipient had chosen to disable email notifications. This change moves the action back into its original location, fixing unit tests and notification functionality, but it does not pass the subject/content/message arguments to the action as we no longer have access to those outside of an `BP_Email` instance.
Follow-up is required to ensure the 2.5 backwards compatibility code is being loaded correctly, or if this was some quirk of our unit test environment.
See <a href="http://buddypress.trac.wordpress.org/ticket/6592">#6592</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitynotificationsphp">trunk/src/bp-activity/bp-activity-notifications.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="trunksrcbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-notifications.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-notifications.php 2016-02-03 09:44:18 UTC (rev 10499)
+++ trunk/src/bp-activity/bp-activity-notifications.php 2016-02-03 19:55:29 UTC (rev 10500)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_send_email( $email_type, $receiver_user_id, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Fires after the sending of an @mention email notification.
+ *
+ * @since 1.5.0
+ * @since 2.5.0 $subject, $message, $content arguments unset and deprecated.
+ *
+ * @param BP_Activity_Activity $activity Activity Item object.
+ * @param string $deprecated Removed in 2.5; now an empty string.
+ * @param string $deprecated Removed in 2.5; now an empty string.
+ * @param string $deprecated Removed in 2.5; now an empty string.
+ * @param int $receiver_user_id The ID of the user who is receiving the update.
+ */
+ do_action( 'bp_activity_sent_mention_email', $activity, '', '', '', $receiver_user_id );
</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-03 09:44:18 UTC (rev 10499)
+++ trunk/src/bp-core/deprecated/2.5.php 2016-02-03 19:55:29 UTC (rev 10500)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -664,14 +664,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_core_deprecated_email_actions( $email, $delivery_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pre_2_5_emails = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'activity-at-message',
</del><span class="cx" style="display: block; padding: 0 10px"> 'activity-comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'activity-comment-author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-user-registration',
</span><span class="cx" style="display: block; padding: 0 10px"> 'core-user-registration-with-blog',
</span><span class="cx" style="display: block; padding: 0 10px"> 'friends-request',
</span><span class="cx" style="display: block; padding: 0 10px"> 'friends-request-accepted',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'groups-at-message',
</del><span class="cx" style="display: block; padding: 0 10px"> 'groups-details-updated',
</span><span class="cx" style="display: block; padding: 0 10px"> 'groups-invitation',
</span><span class="cx" style="display: block; padding: 0 10px"> 'groups-member-promoted',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,21 +724,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_activity_sent_reply_to_reply_email', $tokens['parent-comment-user.id'], $email_subject, $email_content, $tokens['comment.id'], $tokens['commenter.id'], array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $email_type === 'activity-at-message' || $email_type === 'groups-at-message' ) {
- /**
- * Fires after the sending of an @mention email notification.
- *
- * @since 1.5.0
- * @deprecated 2.5.0 Use the filters in BP_Email.
- *
- * @param BP_Activity_Activity $activity Activity Item object.
- * @param string $email_subject Email notification subject text.
- * @param string $email_content Email notification message text.
- * @param string $content Content of the @mention.
- * @param int $receiver_user_id The ID of the user who is receiving the update.
- */
- do_action( 'bp_activity_sent_mention_email', $tokens['activity'], $email_subject, $email_content, $tokens['content'], $tokens['receiver-user.id'] );
-
</del><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $email_type === 'core-user-registration' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tokens['user_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>