WordPress.org

Make WordPress Core

Changeset 43435


Ignore:
Timestamp:
07/08/2018 01:54:02 PM (2 weeks 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/file.php

    r43353 r43435  
    22372237    $email_address = $request->email;
    22382238    $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
    2239     $site_name = is_multisite() ? get_site_option( 'site_name' ) : get_option( 'blogname' );
    2240     $site_url = network_home_url();
     2239    $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
     2240    $site_url = home_url();
    22412241
    22422242    $content = str_replace( '###EXPIRATION###', $expiration_date, $content );
    22432243    $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
    22442244    $content = str_replace( '###EMAIL###', $email_address, $content );
    2245     $content = str_replace( '###SITENAME###', wp_specialchars_decode( $site_name, ENT_QUOTES ), $content );
     2245    $content = str_replace( '###SITENAME###', $site_name, $content );
    22462246    $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
    22472247
     
    22502250        sprintf(
    22512251            __( '[%s] Personal Data Export' ),
    2252             wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
     2252            $site_name
    22532253        ),
    22542254        $content
Note: See TracChangeset for help on using the changeset viewer.