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

Timestamp:

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

Author:

johnjamesjacoby

Message:

Fixes #2523 props cnorris23

File:

• branches/1.2/bp-activity/bp-activity-notifications.php (modified) (6 diffs)

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

@@ -17 +17 @@
 
         // Now email the user with the contents of the message (if they have enabled email notifications)
-        if ( 'no' != get_usermeta( $receiver_user_id, 'notification_activity_new_mention' ) ) {
+        if ( 'no' != get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
             $poster_name = bp_core_get_user_displayname( $poster_user_id );
 
@@ -29 +29 @@
             $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 an update', 'buddypress' ), $poster_name );
+            $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 
 $message = sprintf( __(
@@ -61 +61 @@
     $original_activity = new BP_Activity_Activity( $activity_id );
 
-    if ( $original_activity->user_id != $commenter_id && 'no' != get_usermeta( $original_activity->user_id, 'notification_activity_new_reply' ) ) {
+    if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
         $poster_name = bp_core_get_user_displayname( $commenter_id );
         $thread_link = bp_activity_get_permalink( $activity_id );
@@ -72 +72 @@
         $ud = bp_core_get_core_userdata( $original_activity->user_id );
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
 
 $message = sprintf( __(
@@ -103 +103 @@
     $parent_comment = new BP_Activity_Activity( $parent_id );
 
-    if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_usermeta( $parent_comment->user_id, 'notification_activity_new_reply' ) ) {
+    if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
         $poster_name = bp_core_get_user_displayname( $commenter_id );
         $thread_link = bp_activity_get_permalink( $activity_id );
@@ -111 +111 @@
         $ud = bp_core_get_core_userdata( $parent_comment->user_id );
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
 
         $poster_name = stripslashes( $poster_name );