From 3d85e311efccdc498a88494c4bc6ddd66b3279d7 Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Sun, 8 Jul 2018 13:54:02 +0000 Subject: [PATCH] Privacy: Fix a further inconsistency of site name and URL usage in notification emails. This is a follow-up to [43388]. Props desrosj. Fixes #44396. git-svn-id: https://develop.svn.wordpress.org/trunk@43435 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/file.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index da215b7a14..1373537a07 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -2236,20 +2236,20 @@ All at ###SITENAME### $email_address = $request->email; $export_file_url = get_post_meta( $request_id, '_export_file_url', true ); - $site_name = is_multisite() ? get_site_option( 'site_name' ) : get_option( 'blogname' ); - $site_url = network_home_url(); + $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); + $site_url = home_url(); $content = str_replace( '###EXPIRATION###', $expiration_date, $content ); $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content ); $content = str_replace( '###EMAIL###', $email_address, $content ); - $content = str_replace( '###SITENAME###', wp_specialchars_decode( $site_name, ENT_QUOTES ), $content ); + $content = str_replace( '###SITENAME###', $site_name, $content ); $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content ); $mail_success = wp_mail( $email_address, sprintf( __( '[%s] Personal Data Export' ), - wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) + $site_name ), $content );