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

trunk/bp-core/bp-core-filters.php

@@ -256 +256 @@
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
     $message         = sprintf( __( "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1\$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2\$s", 'buddypress' ), $activate_url, esc_url( "http://{$domain}{$path}" ) );
-    $subject         = '[' . $from_name . '] ' . sprintf(__( 'Activate %s', 'buddypress' ), esc_url( 'http://' . $domain . $path ) );
+    $subject         = bp_get_email_subject( array( 'text' => sprintf( __( 'Activate %s', 'buddypress' ), 'http://' . $domain . $path ) ) );
 
     // Send the message
@@ -284 +284 @@
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
     $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