Changeset 6589 for trunk/bp-friends/bp-friends-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-friends/bp-friends-notifications.php (modified) (2 diffs)

trunk/bp-friends/bp-friends-notifications.php

@@ -29 +29 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
-    $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
-
-    $message = sprintf( __(
+    $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name ) ) );
+    $message  = sprintf( __(
 '%1$s wants to add you as a friend.
 
@@ -68 +66 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
-    $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
-
-    $message = sprintf( __(
+    $subject  = bp_get_email_subject( array( 'text' => sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name ) ) );
+    $message  = sprintf( __(
 '%1$s accepted your friend request.