Skip to:
Content

BuddyPress.org

Changeset 3211


Ignore:
Timestamp:
08/21/2010 06:01:31 AM (16 years ago)
Author:
johnjamesjacoby
Message:

Fixes #2482

Location:
branches/1.2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/1.2/bp-activity/bp-activity-notifications.php

    r3145 r3211  
    2727
    2828                        // Set up and send the message
    29                         $ud = bp_core_get_core_userdata( $receiver_user_id );
    30                         $to = $ud->user_email;
    31                         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
     29                        $ud       = bp_core_get_core_userdata( $receiver_user_id );
     30                        $to       = $ud->user_email;
     31                        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     32                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
    3233
    3334$message = sprintf( __(
    … …  
    7071
    7172                // Set up and send the message
    72                 $ud = bp_core_get_core_userdata( $original_activity->user_id );
    73                 $to = $ud->user_email;
    74                 $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
     73                $ud       = bp_core_get_core_userdata( $original_activity->user_id );
     74                $to       = $ud->user_email;
     75                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     76                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
    7577
    7678$message = sprintf( __(
    … …  
    109111
    110112                // Set up and send the message
    111                 $ud = bp_core_get_core_userdata( $parent_comment->user_id );
    112                 $to = $ud->user_email;
    113                 $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
     113                $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
     114                $to       = $ud->user_email;
     115                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     116                $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
    114117
    115118                $poster_name = stripslashes( $poster_name );

  • branches/1.2/bp-friends/bp-friends-notifications.php

    r3145 r3211  
    1818
    1919        // Set up and send the message
    20         $to = $ud->user_email;
    21         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
     20        $to       = $ud->user_email;
     21        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     22        $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
    2223
    2324        $message = sprintf( __(
    … …  
    5758
    5859        // Set up and send the message
    59         $to = $ud->user_email;
    60         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
     60        $to       = $ud->user_email;
     61        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     62        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
    6163
    6264        $message = sprintf( __(

  • branches/1.2/bp-groups/bp-groups-notifications.php

    r3145 r3211  
    44        global $bp;
    55
    6         $group = new BP_Groups_Group( $group_id );
    7         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . __( 'Group Details Updated', 'buddypress' );
     6        $group    = new BP_Groups_Group( $group_id );
     7        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     8        $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
    89
    910        $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
    … …  
    5960
    6061        // Set up and send the message
    61         $to = $ud->user_email;
    62         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
     62        $to       = $ud->user_email;
     63        $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
     64        $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
    6365
    6466$message = sprintf( __(
    … …  
    105107
    106108        // Set up and send the message
    107         $to = $ud->user_email;
     109        $to       = $ud->user_email;
     110        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
    108111
    109112        if ( $accepted ) {
    110                 $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
    111                 $message = sprintf( __(
     113                $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
     114                $message  = sprintf( __(
    112115'Your membership request for the group "%s" has been accepted.
    113116
    … …  
    118121
    119122        } else {
    120                 $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
     123                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
    121124                $message = sprintf( __(
    122125'Your membership request for the group "%s" has been rejected.
    … …  
    162165
    163166        // Set up and send the message
    164         $to = $ud->user_email;
    165 
    166         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
     167        $to       = $ud->user_email;
     168        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     169        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
    167170
    168171        $message = sprintf( __(
    … …  
    210213
    211214                // Set up and send the message
    212                 $to = $invited_ud->user_email;
    213 
    214                 $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
     215                $to       = $invited_ud->user_email;
     216                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     217                $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
    215218
    216219                $message = sprintf( __(
    … …  
    269272
    270273                        // Set up and send the message
    271                         $ud = bp_core_get_core_userdata( $receiver_user_id );
    272                         $to = $ud->user_email;
    273                         $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
     274                        $ud       = bp_core_get_core_userdata( $receiver_user_id );
     275                        $to       = $ud->user_email;
     276                        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     277                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
    274278
    275279$message = sprintf( __(

  • branches/1.2/bp-messages/bp-messages-notifications.php

    r3145 r3211  
    1919
    2020                // Set up and send the message
    21                 $email_to = $ud->user_email;
    22                 $email_subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
     21                $email_to      = $ud->user_email;
     22                $sitename      = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
     23                $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
    2324
    2425                $email_content = sprintf( __(
Note: See TracChangeset for help on using the changeset viewer.