<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[43388] trunk/src/wp-includes/user.php: Privacy: Use consistent values for the site name and URL used in notification emails.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/43388">43388</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/43388","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-07-03 16:59:36 +0000 (Tue, 03 Jul 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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.
Fixes <a href="https://core.trac.wordpress.org/ticket/44396">#44396</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2018-07-03 15:58:58 UTC (rev 43387)
+++ trunk/src/wp-includes/user.php 2018-07-03 16:59:36 UTC (rev 43388)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2733,11 +2733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $current_user->ID, '_new_email', $new_user_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() ) {
- $sitename = get_site_option( 'site_name' );
- } else {
- $sitename = get_option( 'blogname' );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
</span><span class="cx" style="display: block; padding: 0 10px"> $email_text = __(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2784,10 +2780,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail=' . $hash ) ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $_POST['email'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', wp_specialchars_decode( $sitename, ENT_QUOTES ), $content );
- $content = str_replace( '###SITEURL###', network_home_url(), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', $sitename, $content );
+ $content = str_replace( '###SITEURL###', home_url(), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), $sitename ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['email'] = $current_user->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2997,7 +2993,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_email' => $request_data->email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $action_description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'manage_url' => $manage_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sitename' => get_option( 'blogname' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => home_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_email' => $admin_email,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3049,18 +3045,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'user_confirmed_action_email_content', $email_text, $email_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USER_EMAIL###', $email_data['user_email'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###DESCRIPTION###', $email_data['description'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###MANAGE_URL###', esc_url_raw( $email_data['manage_url'] ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Site name. 2: Name of the confirmed action. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '[%1$s] Action Confirmed: %2$s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $email_data['sitename'],
</ins><span class="cx" style="display: block; padding: 0 10px"> $action_description
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3070,7 +3064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.7
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject The email subject.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $blogname The name of the site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $sitename The name of the site.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $email_data {
</span><span class="cx" style="display: block; padding: 0 10px"> * Data relating to the account action email.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3083,7 +3077,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $admin_email The administrator email receiving the mail.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $blogname, $email_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $email_data['sitename'], $email_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email_sent = wp_mail( $email_data['admin_email'], $subject, $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3114,12 +3108,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = sprintf(
- /* translators: %s Site name. */
- __( '[%s] Erasure Request Fulfilled' ),
- wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the recipient of the data erasure fulfillment notification.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3134,10 +3122,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'request' => $request_data,
</span><span class="cx" style="display: block; padding: 0 10px"> 'message_recipient' => $user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'privacy_policy_url' => get_privacy_policy_url(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sitename' => get_option( 'blogname' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => home_url(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = sprintf(
+ /* translators: %s: Site name. */
+ __( '[%s] Erasure Request Fulfilled' ),
+ $email_data['sitename']
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $email_data['privacy_policy_url'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate SITENAME, SITEURL; those are placeholders. */
</span><span class="cx" style="display: block; padding: 0 10px"> $email_text = __(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3197,7 +3191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'user_confirmed_action_email_content', $email_text, $email_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###PRIVACY_POLICY_URL###', $email_data['privacy_policy_url'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3360,8 +3354,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'request_id' => $request_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'confirm_key' => wp_generate_user_request_key( $request_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> ), wp_login_url() ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sitename' => is_multisite() ? get_site_option( 'site_name' ) : get_option( 'blogname' ),
- 'siteurl' => network_home_url(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ),
+ 'siteurl' => home_url(),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate DESCRIPTION, CONFIRM_URL, SITENAME, SITEURL: those are placeholders. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3412,13 +3406,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###DESCRIPTION###', $email_data['description'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###CONFIRM_URL###', esc_url_raw( $email_data['confirm_url'] ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $email_data['email'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy data request subject. 1: Site name, 2: Name of the action */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $blogname, $email_data['description'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $email_data['sitename'], $email_data['description'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the subject of the email sent when an account action is attempted.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3426,7 +3418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject The email subject.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $blogname The name of the site.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $sitename The name of the site.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $email_data {
</span><span class="cx" style="display: block; padding: 0 10px"> * Data relating to the account action email.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3438,7 +3430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $siteurl The site URL sending the mail.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = apply_filters( 'user_request_action_email_subject', $subject, $blogname, $email_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $subject = apply_filters( 'user_request_action_email_subject', $subject, $email_data['sitename'], $email_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_mail( $email_data['email'], $subject, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>