Skip to:
Content

BuddyPress.org

Changeset 4144


Ignore:
Timestamp:
03/15/2011 02:55:33 PM (15 years ago)
Author:
boonebgorges
Message:

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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r4118 r4144  
    6060                        $to = apply_filters( 'bp_activity_at_message_notification_to', $to );
    6161                        $subject = apply_filters( 'bp_activity_at_message_notification_subject', $subject, $poster_name );
    62                         $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link );
     62                        $message = apply_filters( 'bp_activity_at_message_notification_message', $message, $poster_name, $content, $message_link, $settings_link );
    6363
    6464                        wp_mail( $to, $subject, $message );
    … …  
    106106                $to = apply_filters( 'bp_activity_new_comment_notification_to', $to );
    107107                $subject = apply_filters( 'bp_activity_new_comment_notification_subject', $subject, $poster_name );
    108                 $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link );
     108                $message = apply_filters( 'bp_activity_new_comment_notification_message', $message, $poster_name, $content, $thread_link, $settings_link );
    109109
    110110                wp_mail( $to, $subject, $message );
    … …  
    151151                $to = apply_filters( 'bp_activity_new_comment_notification_comment_author_to', $to );
    152152                $subject = apply_filters( 'bp_activity_new_comment_notification_comment_author_subject', $subject, $poster_name );
    153                 $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content );
     153                $message = apply_filters( 'bp_activity_new_comment_notification_comment_author_message', $message, $poster_name, $content, $settings_link );
    154154
    155155                wp_mail( $to, $subject, $message );

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

    r3614 r4144  
    3737        $to = apply_filters( 'friends_notification_new_request_to', $to );
    3838        $subject = apply_filters( 'friends_notification_new_request_subject', $subject, $initiator_name );
    39         $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link );
     39        $message = apply_filters( 'friends_notification_new_request_message', $message, $initiator_name, $initiator_link, $all_requests_link, $settings_link );
    4040
    4141        wp_mail( $to, $subject, $message );
    … …  
    7777        $to = apply_filters( 'friends_notification_accepted_request_to', $to );
    7878        $subject = apply_filters( 'friends_notification_accepted_request_subject', $subject, $friend_name );
    79         $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link );
     79        $message = apply_filters( 'friends_notification_accepted_request_message', $message, $friend_name, $friend_link, $settings_link );
    8080
    8181        wp_mail( $to, $subject, $message );

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

    r4118 r4144  
    3333                $to      = apply_filters( 'groups_notification_group_updated_to', $to );
    3434                $subject = apply_filters_ref_array( 'groups_notification_group_updated_subject', array( $subject, &$group ) );
    35                 $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link ) );
     35                $message = apply_filters_ref_array( 'groups_notification_group_updated_message', array( $message, &$group, $group_link, $settings_link ) );
    3636
    3737                wp_mail( $to, $subject, $message );
    … …  
    8484        $to      = apply_filters( 'groups_notification_new_membership_request_to', $to );
    8585        $subject = apply_filters_ref_array( 'groups_notification_new_membership_request_subject', array( $subject, &$group ) );
    86         $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests ) );
     86        $message = apply_filters_ref_array( 'groups_notification_new_membership_request_message', array( $message, &$group, $requesting_user_name, $profile_link, $group_requests, $settings_link ) );
    8787
    8888        wp_mail( $to, $subject, $message );
    … …  
    140140        $to      = apply_filters( 'groups_notification_membership_request_completed_to', $to );
    141141        $subject = apply_filters_ref_array( 'groups_notification_membership_request_completed_subject', array( $subject, &$group ) );
    142         $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link ) );
     142        $message = apply_filters_ref_array( 'groups_notification_membership_request_completed_message', array( $message, &$group, $group_link, $settings_link ) );
    143143
    144144        wp_mail( $to, $subject, $message );
    … …  
    188188        $to      = apply_filters( 'groups_notification_promoted_member_to', $to );
    189189        $subject = apply_filters_ref_array( 'groups_notification_promoted_member_subject', array( $subject, &$group ) );
    190         $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link ) );
     190        $message = apply_filters_ref_array( 'groups_notification_promoted_member_message', array( $message, &$group, $promoted_to, $group_link, $settings_link ) );
    191191
    192192        wp_mail( $to, $subject, $message );
    … …  
    242242                $to      = apply_filters( 'groups_notification_group_invites_to', $to );
    243243                $subject = apply_filters_ref_array( 'groups_notification_group_invites_subject', array( $subject, &$group ) );
    244                 $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link ) );
     244                $message = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $message, &$group, $inviter_name, $inviter_link, $invites_link, $group_link, $settings_link ) );
    245245
    246246                wp_mail( $to, $subject, $message );
    … …  
    302302                        $to = apply_filters( 'groups_at_message_notification_to', $to );
    303303                        $subject = apply_filters( 'groups_at_message_notification_subject', $subject, $group, $poster_name );
    304                         $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link );
     304                        $message = apply_filters( 'groups_at_message_notification_message', $message, $group, $poster_name, $content, $message_link, $settings_link );
    305305
    306306                        wp_mail( $to, $subject, $message );

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

    r3757 r4144  
    4545                $email_to = apply_filters( 'messages_notification_new_message_to', $email_to );
    4646                $email_subject = apply_filters( 'messages_notification_new_message_subject', $email_subject, $sender_name );
    47                 $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link );
     47                $email_content = apply_filters( 'messages_notification_new_message_message', $email_content, $sender_name, $subject, $content, $message_link, $settings_link );
    4848
    4949                wp_mail( $email_to, $email_subject, $email_content );
Note: See TracChangeset for help on using the changeset viewer.