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

trunk/bp-groups/bp-groups-notifications.php

@@ -17 +17 @@
 
     $group    = groups_get_group( array( 'group_id' => $group_id ) );
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
-    $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
-
+    $subject  = bp_get_email_subject( array( 'text' => __( 'Group Details Updated', 'buddypress' ) ) );
     $user_ids = BP_Groups_Member::get_group_member_ids( $group->id );
+
     foreach ( (array) $user_ids as $user_id ) {
         if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue;
@@ -74 +73 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
-    $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+    $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name ) ) );
 
 $message = sprintf( __(
@@ -123 +121 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
 
     if ( $accepted ) {
-        $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+        $subject = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name ) ) );
         $message = sprintf( __(
 'Your membership request for the group "%1$s" has been accepted.
@@ -136 +133 @@
 
     } else {
-        $subject = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+        $subject = bp_get_email_subject( array( 'text' => sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name ) ) );
         $message = sprintf( __(
 'Your membership request for the group "%1$s" has been rejected.
@@ -182 +179 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = bp_get_option( 'blogname', 'WordPress' );
-    $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
-
-    $message = sprintf( __(
+    $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name ) ) );
+    $message  = sprintf( __(
 'You have been promoted to %1$s for the group: "%2$s".
 
@@ -232 +227 @@
         // Set up and send the message
         $to       = $invited_ud->user_email;
-        $sitename = bp_get_option( 'blogname', 'WordPress' );
-        $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+        $subject  = bp_get_email_subject( array( 'text' => sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name ) ) );
 
         $message = sprintf( __(