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

Timestamp:

07/22/2010 11:09:28 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2523 props cnorris23

File:

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

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

@@ -5 +5 @@
 
         $group = new BP_Groups_Group( $group_id );
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . __( 'Group Details Updated', 'buddypress' );
 
         $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
         foreach ( (array)$user_ids as $user_id ) {
-                if ( 'no' == get_usermeta( $user_id, 'notification_groups_group_updated' ) ) continue;
+                if ( 'no' == get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue;
 
                 $ud = bp_core_get_core_userdata( $user_id );
@@ -45 +45 @@
         bp_core_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
 
-        if ( 'no' == get_usermeta( $admin_id, 'notification_groups_membership_request' ) )
+        if ( 'no' == get_user_meta( $admin_id, 'notification_groups_membership_request', true ) )
                 return false;
 
@@ -60 +60 @@
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 
 $message = sprintf( __(
@@ -94 +94 @@
                 bp_core_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
 
-        if ( 'no' == get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) )
+        if ( 'no' == get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) )
                 return false;
 
@@ -108 +108 @@
 
         if ( $accepted ) {
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
                 $message = sprintf( __(
 'Your membership request for the group "%s" has been accepted.
@@ -118 +118 @@
 
         } else {
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
                 $message = sprintf( __(
 'Your membership request for the group "%s" has been rejected.
@@ -152 +152 @@
         bp_core_add_notification( $group_id, $user_id, 'groups', $type );
 
-        if ( 'no' == get_usermeta( $user_id, 'notification_groups_admin_promotion' ) )
+        if ( 'no' == get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
                 return false;
 
@@ -164 +164 @@
         $to = $ud->user_email;
 
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
 
         $message = sprintf( __(
@@ -200 +200 @@
                 bp_core_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' );
 
-                if ( 'no' == get_usermeta( $invited_user_id, 'notification_groups_invite' ) )
+                if ( 'no' == get_user_meta( $invited_user_id, 'notification_groups_invite', true ) )
                         return false;
 
@@ -212 +212 @@
                 $to = $invited_ud->user_email;
 
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
 
                 $message = sprintf( __(
@@ -259 +259 @@
 
                 // Now email the user with the contents of the message (if they have enabled email notifications)
-                if ( 'no' != get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
+                if ( 'no' != get_user_meta( $user_id, 'notification_activity_new_mention', true ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
 
@@ -271 +271 @@
                         $ud = bp_core_get_core_userdata( $receiver_user_id );
                         $to = $ud->user_email;
-                        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
+                        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
 
 $message = sprintf( __(