Ticket #25346: patch-decode-subject-lines.diff

wp-admin/includes/ms.php

@@ -259 +259 @@
         $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
-        wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), get_option( 'blogname' ) ), $content );
+        wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
 }
 add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
 add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
@@ -328 +328 @@
                 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
                 $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
-                wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), get_option( 'blogname' ) ), $content );
+                wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
                 $_POST['email'] = $current_user->user_email;
         }
 }

wp-admin/ms-delete-site.php

@@ -68 +68 @@
         $content = str_replace( '###URL_DELETE###', $url_delete, $content );
         $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
 
-        wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content );
+        wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
         ?>
 
         <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p>

wp-admin/user-new.php

@@ -85 +85 @@
 
 Please click the following link to confirm the invite:
 %4$s' );
-                        wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
+                        wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
                         $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
                 }
         }