Changeset 43435

Timestamp:

07/08/2018 01:54:02 PM (6 years ago)

Author:

flixos90

Message:

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.

File:

• trunk/src/wp-admin/includes/file.php (modified) (2 diffs)

trunk/src/wp-admin/includes/file.php

@@ -2237 +2237 @@
     $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 );
 
@@ -2250 +2250 @@
         sprintf(
             __( '[%s] Personal Data Export' ),
-            wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
+            $site_name
         ),
         $content