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

Timestamp:

12/10/2012 09:55:56 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Revert r6587:

• Introduce bp_get_email_subject() function, to handle formatting of email subjects.
• For all components with notifications, including deprecated files.
• Fixes #4401, better this time.

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 = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name ) ) );
 
         if ( bp_is_active( 'groups' ) && bp_is_group() ) {
@@ -158 +157 @@
 
         // Set up and send the message
-        $ud       = bp_core_get_core_userdata( $original_activity->user_id );
-        $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
-
-$message = sprintf( __(
+        $ud      = bp_core_get_core_userdata( $original_activity->user_id );
+        $to      = $ud->user_email;
+        $subject = bp_get_email_subject( array( 'text' => sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name ) ) );
+        $message = sprintf( __(
 '%1$s replied to one of your updates:
 
@@ -203 +200 @@
         $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
         $to       = $ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
+        $subject = bp_get_email_subject( array( 'text' => sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name ) ) );
 
         $poster_name = stripslashes( $poster_name );