Changeset 6587

Timestamp:

12/10/2012 09:36:05 AM (12 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.

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (3 diffs)
• bp-core/bp-core-filters.php (modified) (3 diffs)
• bp-core/deprecated/1.5.php (modified) (1 diff)
• bp-friends/bp-friends-notifications.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (5 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -71 +71 @@
         $ud       = bp_core_get_core_userdata( $receiver_user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject  = '[' . $sitename . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 
@@ -160 +160 @@
         $ud       = bp_core_get_core_userdata( $original_activity->user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
 
@@ -203 +203 @@
         $ud       = bp_core_get_core_userdata( $parent_comment->user_id );
         $to       = $ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject = '[' . $sitename . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
 

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 );

trunk/bp-core/deprecated/1.5.php

@@ -350 +350 @@
             $ud = bp_core_get_core_userdata( $receiver_user_id );
             $to = $ud->user_email;
-            $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+            $sitename = bp_get_option( 'blogname', 'WordPress' );
             $subject  = '[' . $sitename . '] ' . sprintf( __( '%1$s mentioned you in the group "%2$s"', 'buddypress' ), $poster_name, $group->name );
 

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

@@ -29 +29 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
     $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
 
@@ -68 +68 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
     $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
 

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

@@ -17 +17 @@
 
     $group    = groups_get_group( array( 'group_id' => $group_id ) );
-    $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
     $subject  = '[' . $sitename . '] ' . __( 'Group Details Updated', 'buddypress' );
 
@@ -74 +74 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
     $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 
@@ -123 +123 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
 
     if ( $accepted ) {
@@ -182 +182 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+    $sitename = bp_get_option( 'blogname', 'WordPress' );
     $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
 
@@ -232 +232 @@
         // Set up and send the message
         $to       = $invited_ud->user_email;
-        $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+        $sitename = bp_get_option( 'blogname', 'WordPress' );
         $subject  = '[' . $sitename . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
 

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

@@ -1340 +1340 @@
     $activate_url = esc_url( $activate_url );
 
-    $from_name = ( '' == bp_get_option( 'blogname' ) ) ? __( 'BuddyPress', 'buddypress' ) : esc_html( bp_get_option( 'blogname' ) );
+    $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 );

trunk/bp-messages/bp-messages-notifications.php

@@ -48 +48 @@
             // Set up and send the message
             $email_to      = $ud->user_email;
-            $sitename      = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
+            $sitename      = bp_get_option( 'blogname', 'WordPress' );
             $email_subject = '[' . $sitename . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );