<!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>[41213] trunk/src/wp-includes/pluggable.php: Users: Switch to using array style filters for the newly introduced filters in `wp_password_change_notification()` and `wp_new_user_notification()`.</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 { 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/41213">41213</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/41213","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-03 13:20:38 +0000 (Thu, 03 Aug 2017)</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'>Users: Switch to using array style filters for the newly introduced filters in `wp_password_change_notification()` and `wp_new_user_notification()`.
This introduces three new filters, replacing those that were introduced in <a href="https://core.trac.wordpress.org/changeset/41153">[41153]</a>:
* `wp_password_change_notification_email`
* `wp_new_user_notification_email_admin`
* `wp_new_user_notification_email`
Props pbearne
Fixes <a href="https://core.trac.wordpress.org/ticket/38068">#38068</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2017-08-02 21:37:16 UTC (rev 41212)
+++ trunk/src/wp-includes/pluggable.php 2017-08-03 13:20:38 UTC (rev 41213)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1748,41 +1748,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // we want to reverse this for the plain text arena of emails.
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site title */
- $subject = sprintf( __( '[%s] Password Changed' ), $blogname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_password_change_notification_email = array(
+ 'to' => get_option( 'admin_email' ),
+ /* translators: Password change notification email subject. %s: Site title */
+ 'subject' => __( '[%s] Password Changed' ),
+ 'message' => $message,
+ 'headers' => '',
+ );
</ins><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">- * Filters the subject of the password change notification email sent to the site admin.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the contents of the password change notification email sent to the site admin.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $subject Email subject.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $wp_password_change_notification_email {
+ * Used to build wp_mail().
+ *
+ * @type string $to The intended recipient - site admin email address.
+ * @type string $subject The subject of the email.
+ * @type string $message The body of the email.
+ * @type string $headers The headers of the email.
+ * }
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $user User object for user whose password was changed.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $blogname The site title.
</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( 'wp_password_change_notification_subject', $subject, $user, $blogname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_password_change_notification_email = apply_filters( 'wp_password_change_notification_email', $wp_password_change_notification_email, $user, $blogname );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the message body of the password change notification email sent to the site admin.
- *
- * @since 4.9.0
- *
- * @param string $message Email message.
- * @param WP_User $user User object for user whose password was changed.
- */
- $message = apply_filters( 'wp_password_change_notification_message', $message, $user );
-
- /**
- * Filters the email headers of the password change notification admin email sent to the site admin.
- *
- * @since 4.9.0
- *
- * @param string $headers Email headers.
- * @param WP_User $user User object for user whose password was changed.
- */
- $headers = apply_filters( 'wp_password_change_notification_headers', '', $user );
-
- wp_mail( get_option( 'admin_email' ), wp_specialchars_decode( $subject ), $message, $headers );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail(
+ $wp_password_change_notification_email['to'],
+ wp_specialchars_decode( sprintf( $wp_password_change_notification_email['subject'], $blogname ) ),
+ $wp_password_change_notification_email['message'],
+ $wp_password_change_notification_email['headers']
+ );
</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"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1822,46 +1819,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_locale = switch_to_locale( get_locale() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: site title */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $subject = sprintf( __( '[%s] New User Registration' ), $blogname );
- /* translators: %s: site title */
</del><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user login */
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user email address */
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the subject of the new user notification email sent to the site admin.
- *
- * @since 4.9.0
- *
- * @param string $subject Email subject.
- * @param WP_User $user User object for newly registered user.
- * @param string $blogname The site title.
- */
- $subject = apply_filters( 'wp_new_user_notification_admin_subject', $subject, $user, $blogname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_new_user_notification_email_admin = array(
+ 'to' => get_option( 'admin_email' ),
+ /* translators: Password change notification email subject. %s: Site title */
+ 'subject' => __( '[%s] New User Registration' ),
+ 'message' => $message,
+ 'headers' => '',
+ );
</ins><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">- * Filters the message body of the new user notification email sent to the site admin.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the contents of the new user notification email sent to the site admin.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $message Email message.
- * @param WP_User $user User object for newly registered user.
- */
- $message = apply_filters( 'wp_new_user_notification_admin_message', $message, $user );
-
- /**
- * Filters the email headers of the new user notification email sent to the site admin.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $wp_new_user_notification_email {
+ * Used to build wp_mail().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.9.0
- *
- * @param string $headers Email headers.
- * @param WP_User $user User object for newly registered user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $to The intended recipient - site admin email address.
+ * @type string $subject The subject of the email.
+ * @type string $message The body of the email.
+ * @type string $headers The headers of the email.
+ * }
+ * @param WP_User $user User object for new user.
+ * @param string $blogname The site title.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $headers = apply_filters( 'wp_new_user_notification_admin_headers', '', $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_new_user_notification_email_admin = apply_filters( 'wp_new_user_notification_email_admin', $wp_new_user_notification_email_admin, $user, $blogname );
</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( get_option( 'admin_email' ), wp_specialchars_decode( $subject ), $message, $headers );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ @wp_mail(
+ $wp_new_user_notification_email_admin['to'],
+ wp_specialchars_decode( sprintf( $wp_new_user_notification_email_admin['subject'], $blogname ) ),
+ $wp_new_user_notification_email_admin['message'],
+ $wp_new_user_notification_email_admin['headers']
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1889,8 +1884,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_locale = switch_to_locale( get_user_locale( $user ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: site title */
- $subject = sprintf( __( '[%s] Your username and password info' ), $blogname );
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user login */
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= __('To set your password, visit the following address:') . "\r\n\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1898,39 +1891,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= wp_login_url() . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the subject of the new user email sent to the new user.
- *
- * @since 4.9.0
- *
- * @param string $subject Email subject.
- * @param WP_User $user User object for newly registered user.
- * @param string $blogname The site title.
- */
- $subject = apply_filters( 'wp_new_user_notification_subject', $subject, $user, $blogname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_new_user_notification_email = array(
+ 'to' => $user->user_email,
+ /* translators: Password change notification email subject. %s: Site title */
+ 'subject' => __( '[%s] Your username and password info' ),
+ 'message' => $message,
+ 'headers' => '',
+ );
</ins><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">- * Filters the message body of the new user email sent to the new user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the contents of the new user notification email sent to the new user.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $message Email message.
- * @param WP_User $user User object for newly registered user.
- * @param string $key User activation key.
- */
- $message = apply_filters( 'wp_new_user_notification_message', $message, $user, $key );
-
- /**
- * Filters the email headers of the new user email sent to the new user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $wp_new_user_notification_email {
+ * Used to build wp_mail().
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.9.0
- *
- * @param string $headers Email headers.
- * @param WP_User $user User object for newly registered user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $to The intended recipient - New user email address.
+ * @type string $subject The subject of the email.
+ * @type string $message The body of the email.
+ * @type string $headers The headers of the email.
+ * }
+ * @param WP_User $user User object for new user.
+ * @param string $blogname The site title.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $headers = apply_filters( 'wp_new_user_notification_headers', '', $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_new_user_notification_email = apply_filters( 'wp_new_user_notification_email', $wp_new_user_notification_email, $user, $blogname );
</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( $user->user_email, wp_specialchars_decode( $subject ), $message, $headers );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail(
+ $wp_new_user_notification_email['to'],
+ wp_specialchars_decode( sprintf( $wp_new_user_notification_email['subject'], $blogname ) ),
+ $wp_new_user_notification_email['message'],
+ $wp_new_user_notification_email['headers']
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span></span></pre>
</div>
</div>
</body>
</html>