Changeset 6587 for trunk/bp-core/bp-core-filters.php

Timestamp:

12/10/2012 09:36:05 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Revert r6586:

• Do not call esc_html() on site_name in sign-up email titles.
• Do not decode email blogname section of email subjects into HTML entities.
• For all components with notifications, including deprecated files.
• Fixes #4401.

File:

• trunk/bp-core/bp-core-filters.php (modified) (3 diffs)

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

@@ -105 +105 @@
  *
  * @package BuddyPress Core
- * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
+ * @uses bp_get_option() fetches the value for a meta_key in the wp_X_options table
  * @return The blog name for the root blog
  */
 function bp_core_email_from_name_filter() {
-    return apply_filters( 'bp_core_email_from_name_filter', wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES ) );
+    return apply_filters( 'bp_core_email_from_name_filter', bp_get_option( 'blogname', 'WordPress' ) );
 }
 add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
@@ -253 +253 @@
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    $from_name       = get_site_option( 'site_name', 'WordPress' );
+    $from_name       = bp_get_option( 'blogname', 'WordPress' );
     $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}" ) );
@@ -281 +281 @@
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    $from_name       = get_site_option( 'site_name', 'WordPress' );
+    $from_name       = bp_get_option( 'blogname', 'WordPress' );
     $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 );