Changeset 6589 for trunk/bp-members/bp-members-functions.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-members/bp-members-functions.php (modified) (1 diff)

trunk/bp-members/bp-members-functions.php

@@ -1340 +1340 @@
     $activate_url = esc_url( $activate_url );
 
-    $from_name = bp_get_option( 'blogname', 'WordPress' );
-
     $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
-    $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
+    $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
 
     // Send the message