<!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][4144] trunk: Passes settings_link variable to notification message filters.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd>4144</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-03-15 14:55:33 +0000 (Tue, 15 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Passes settings_link variable to notification message filters. Fixes #3113. Props nerrad</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsnotificationsphp">trunk/bp-friends/bp-friends-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-notifications.php (4143 => 4144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2011-03-13 14:30:30 UTC (rev 4143)
+++ trunk/bp-activity/bp-activity-notifications.php 2011-03-15 14:55:33 UTC (rev 4144)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_at_message_notification_to', $to );
</span><span class="cx"> $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
</span><del>- $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link );
</del><ins>+ $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
</span><span class="cx"> $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject, $poster_name );
</span><del>- $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link );
</del><ins>+ $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
</span><span class="cx"> $subject = apply_filters( 'bp_activity_new_comment_notification_comment_author_subject', $subject, $poster_name );
</span><del>- $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content );
</del><ins>+ $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-notifications.php (4143 => 4144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-notifications.php 2011-03-13 14:30:30 UTC (rev 4143)
+++ trunk/bp-friends/bp-friends-notifications.php 2011-03-15 14:55:33 UTC (rev 4144)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'friends_notification_new_request_to', $to );
</span><span class="cx"> $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name );
</span><del>- $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link );
</del><ins>+ $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'friends_notification_accepted_request_to', $to );
</span><span class="cx"> $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject, $friend_name );
</span><del>- $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link );
</del><ins>+ $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (4143 => 4144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2011-03-13 14:30:30 UTC (rev 4143)
+++ trunk/bp-groups/bp-groups-notifications.php 2011-03-15 14:55:33 UTC (rev 4144)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_group_updated_to', $to );
</span><span class="cx"> $subject = apply_filters_ref_array( 'groups_notification_group_updated_subject', array( $subject, &$group ) );
</span><del>- $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link ) );
</del><ins>+ $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link, $settings_link ) );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_new_membership_request_to', $to );
</span><span class="cx"> $subject = apply_filters_ref_array( 'groups_notification_new_membership_request_subject', array( $subject, &$group ) );
</span><del>- $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests ) );
</del><ins>+ $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests, $settings_link ) );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_membership_request_completed_to', $to );
</span><span class="cx"> $subject = apply_filters_ref_array( 'groups_notification_membership_request_completed_subject', array( $subject, &$group ) );
</span><del>- $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link ) );
</del><ins>+ $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link, $settings_link ) );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_promoted_member_to', $to );
</span><span class="cx"> $subject = apply_filters_ref_array( 'groups_notification_promoted_member_subject', array( $subject, &$group ) );
</span><del>- $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link ) );
</del><ins>+ $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link, $settings_link ) );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx">
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_notification_group_invites_to', $to );
</span><span class="cx"> $subject = apply_filters_ref_array( 'groups_notification_group_invites_subject', array( $subject, &$group ) );
</span><del>- $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link ) );
</del><ins>+ $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link, $settings_link ) );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> /* Send the message */
</span><span class="cx"> $to = apply_filters( 'groups_at_message_notification_to', $to );
</span><span class="cx"> $subject = apply_filters( 'groups_at_message_notification_subject', $subject, $group, $poster_name );
</span><del>- $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link );
</del><ins>+ $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $to, $subject, $message );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (4143 => 4144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2011-03-13 14:30:30 UTC (rev 4143)
+++ trunk/bp-messages/bp-messages-notifications.php 2011-03-15 14:55:33 UTC (rev 4144)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> // Send the message
</span><span class="cx"> $email_to = apply_filters( 'messages_notification_new_message_to', $email_to );
</span><span class="cx"> $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name );
</span><del>- $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link );
</del><ins>+ $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link );
</ins><span class="cx">
</span><span class="cx"> wp_mail( $email_to, $email_subject, $email_content );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>