Changeset 6587 for trunk/bp-activity/bp-activity-notifications.php

Timestamp:

12/10/2012 09:36:05 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Revert r6586:

• Do not call esc_html() on site_name in sign-up email titles.
• Do not decode email blogname section of email subjects into HTML entities.
• For all components with notifications, including deprecated files.
• Fixes #4401.

File:

• trunk/bp-activity/bp-activity-notifications.php (modified) (3 diffs)

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

@@ -71 +71 @@
         $ud       = bp_core_get_core_userdata( $receiver_user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 
@@ -160 +160 @@
         $ud       = bp_core_get_core_userdata( $original_activity->user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
 
@@ -203 +203 @@
         $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );