Changeset 4144

Timestamp:

03/15/2011 02:55:33 PM (14 years ago)

Author:

boonebgorges

Message:

Passes settings_link variable to notification message filters. Fixes #3113. Props nerrad

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (3 diffs)
• bp-friends/bp-friends-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (6 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -60 +60 @@
             $to = apply_filters( 'bp_activity_at_message_notification_to', $to );
             $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
-            $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link );
+            $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link );
 
             wp_mail( $to, $subject, $message );
@@ -106 +106 @@
         $to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
         $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject, $poster_name );
-        $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link );
+        $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link, $settings_link );
 
         wp_mail( $to, $subject, $message );
@@ -151 +151 @@
         $to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
         $subject = apply_filters( 'bp_activity_new_comment_notification_comment_author_subject', $subject, $poster_name );
-        $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content );
+        $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content, $settings_link );
 
         wp_mail( $to, $subject, $message );

trunk/bp-friends/bp-friends-notifications.php

@@ -37 +37 @@
     $to = apply_filters( 'friends_notification_new_request_to', $to );
     $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name );
-    $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link );
+    $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link, $settings_link );
 
     wp_mail( $to, $subject, $message );
@@ -77 +77 @@
     $to = apply_filters( 'friends_notification_accepted_request_to', $to );
     $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject, $friend_name );
-    $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link );
+    $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link, $settings_link );
 
     wp_mail( $to, $subject, $message );

trunk/bp-groups/bp-groups-notifications.php

@@ -33 +33 @@
         $to      = apply_filters( 'groups_notification_group_updated_to', $to );
         $subject = apply_filters_ref_array( 'groups_notification_group_updated_subject', array( $subject, &$group ) );
-        $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link ) );
+        $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link, $settings_link ) );
 
         wp_mail( $to, $subject, $message );
@@ -84 +84 @@
     $to      = apply_filters( 'groups_notification_new_membership_request_to', $to );
     $subject = apply_filters_ref_array( 'groups_notification_new_membership_request_subject', array( $subject, &$group ) );
-    $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests ) );
+    $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests, $settings_link ) );
 
     wp_mail( $to, $subject, $message );
@@ -140 +140 @@
     $to      = apply_filters( 'groups_notification_membership_request_completed_to', $to );
     $subject = apply_filters_ref_array( 'groups_notification_membership_request_completed_subject', array( $subject, &$group ) );
-    $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link ) );
+    $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link, $settings_link ) );
 
     wp_mail( $to, $subject, $message );
@@ -188 +188 @@
     $to      = apply_filters( 'groups_notification_promoted_member_to', $to );
     $subject = apply_filters_ref_array( 'groups_notification_promoted_member_subject', array( $subject, &$group ) );
-    $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link ) );
+    $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link, $settings_link ) );
 
     wp_mail( $to, $subject, $message );
@@ -242 +242 @@
         $to      = apply_filters( 'groups_notification_group_invites_to', $to );
         $subject = apply_filters_ref_array( 'groups_notification_group_invites_subject', array( $subject, &$group ) );
-        $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link ) );
+        $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link, $settings_link ) );
 
         wp_mail( $to, $subject, $message );
@@ -302 +302 @@
             $to = apply_filters( 'groups_at_message_notification_to', $to );
             $subject = apply_filters( 'groups_at_message_notification_subject', $subject, $group, $poster_name );
-            $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link );
+            $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link, $settings_link );
 
             wp_mail( $to, $subject, $message );

trunk/bp-messages/bp-messages-notifications.php

@@ -45 +45 @@
         $email_to = apply_filters( 'messages_notification_new_message_to', $email_to );
         $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name );
-        $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link );
+        $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link );
 
         wp_mail( $email_to, $email_subject, $email_content );