Changeset 43354 for branches/4.9

Timestamp:

06/16/2018 10:26:06 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Remove unnecessary This email has been sent to ###EMAIL### from privacy emails.

The line was copied from the emails that get sent when an email address changes, without considering if it made sense in the new context.

Props iandunn, ianbelanger, desrosj.
Merges [43353] to the 4.9 branch.
Fixes #44030.

Location:

branches/4.9

Files:

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

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

@@ -2066 +2066 @@
     $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
 
-/* translators: Do not translate EXPIRATION, LINK, EMAIL, SITENAME, SITEURL: those are placeholders. */
+/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
 $email_text = __(
 'Howdy,
@@ -2077 +2077 @@
 ###LINK###
 
-This email has been sent to ###EMAIL###.
-
 Regards,
 All at ###SITENAME###
@@ -2090 +2088 @@
      * ###EXPIRATION###         The date when the URL will be automatically deleted.
      * ###LINK###               URL of the personal data export file for the user.
-     * ###EMAIL###              The email we are sending to.
      * ###SITENAME###           The name of the site.
      * ###SITEURL###            The URL to the site.

branches/4.9/src/wp-includes/user.php

@@ -3261 +3261 @@
     );
 
-    /* translators: Do not translate DESCRIPTION, CONFIRM_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
+    /* translators: Do not translate DESCRIPTION, CONFIRM_URL, SITENAME, SITEURL: those are placeholders. */
     $email_text = __(
         'Howdy,
@@ -3274 +3274 @@
 You can safely ignore and delete this email if you do not want to
 take this action.
-
-This email has been sent to ###EMAIL###.
 
 Regards,
@@ -3289 +3287 @@
      * ###DESCRIPTION### Description of the action being performed so the user knows what the email is for.
      * ###CONFIRM_URL### The link to click on to confirm the account action.
-     * ###EMAIL###       The email we are sending to.
      * ###SITENAME###    The name of the site.
      * ###SITEURL###     The URL to the site.