Changeset 3211 for branches/1.2/bp-groups/bp-groups-notifications.php

Timestamp:

08/21/2010 06:01:31 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2482

File:

• branches/1.2/bp-groups/bp-groups-notifications.php (modified) (7 diffs)

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

@@ -4 +4 @@
         global $bp;
 
-        $group = new BP_Groups_Group( $group_id );
-        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . __( 'Group Details Updated', 'buddypress' );
+        $group    = new BP_Groups_Group( $group_id );
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
 
         $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
@@ -59 +60 @@
 
         // Set up and send the message
-        $to = $ud->user_email;
-        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 
 $message = sprintf( __(
@@ -105 +107 @@
 
         // Set up and send the message
-        $to = $ud->user_email;
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
 
         if ( $accepted ) {
-                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
-                $message = sprintf( __(
+                $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+                $message  = sprintf( __(
 'Your membership request for the group "%s" has been accepted.
 
@@ -118 +121 @@
 
         } else {
-                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+                $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
                 $message = sprintf( __(
 'Your membership request for the group "%s" has been rejected.
@@ -162 +165 @@
 
         // Set up and send the message
-        $to = $ud->user_email;
-
-        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
 
         $message = sprintf( __(
@@ -210 +213 @@
 
                 // Set up and send the message
-                $to = $invited_ud->user_email;
-
-                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+                $to       = $invited_ud->user_email;
+                $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+                $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
 
                 $message = sprintf( __(
@@ -269 +272 @@
 
                         // Set up and send the message
-                        $ud = bp_core_get_core_userdata( $receiver_user_id );
-                        $to = $ud->user_email;
-                        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
+                        $ud       = bp_core_get_core_userdata( $receiver_user_id );
+                        $to       = $ud->user_email;
+                        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+                        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
 
 $message = sprintf( __(