From 9768bde3c47e29ef664deefa49e68db9c3c33362 Mon Sep 17 00:00:00 2001
From: Felix Arntz <felix-arntz@leaves-and-love.net>
Date: Sun, 8 Jul 2018 13:55:28 +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.

Built from https://develop.svn.wordpress.org/trunk@43435


git-svn-id: http://core.svn.wordpress.org/trunk@43262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/file.php | 8 ++++----
 wp-includes/version.php    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index da215b7a14..1373537a07 100644
--- a/wp-admin/includes/file.php
+++ b/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
 	);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5a222e871e..ed56ddaad4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43434';
+$wp_version = '5.0-alpha-43435';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.