Changeset 43459 for branches/4.9/src/wp-admin/includes/file.php

Timestamp:

07/16/2018 02:23:26 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Use consistent values for the site name and URL used in notification emails.

The functions send_confirmation_on_profile_email(), _wp_privacy_send_request_confirmation_notification(), _wp_privacy_send_erasure_fulfillment_notification(), and wp_send_user_request() all include a title and URL indicating the current site. However, so far they have dealt with those values inconsistently, sometimes using the site values, other times using the network values if in a multisite. This changeset ensures that only the current site is taken into account in all cases and that special characters in the site name are consistently decoded.

Props subrataemfluence, desrosj.
Merges [43388], [43390], and [43435] to the 4.9 branch.
Fixes #44396.

Location:

branches/4.9

Files:

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

branches/4.9/src/wp-admin/includes/file.php

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