<!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>[35735] trunk: Passwords: Support the pre-4.3 behavior of `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/35735">35735</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/35735","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-24 23:06:03 +0000 (Tue, 24 Nov 2015)</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'>Passwords: Support the pre-4.3 behavior of `wp_new_user_notification()`.
Hello, it's me again. A pluggable function named `wp_new_user_notification()`. A few months ago, after <a href="https://core.trac.wordpress.org/changeset/33023">[33023]</a>, I have lost my second parameter `$plaintext_pass`. But thanks to <a href="https://core.trac.wordpress.org/changeset/33620">[33620]</a> I got a new one.
Bad idea - It hasn't had the same behavior as my previous parameter.
To solve that the second parameter got deprecated and reintroduced as the third parameter in <a href="https://core.trac.wordpress.org/changeset/34116">[34116]</a>. I was happy again, for a short time.
You remember my lost friend `$plaintext_pass`? No? Well, if its value was empty no notification was sent to the user. This behavior was still lost. And that's what this change is about: Don't notify a user if a plugin uses `wp_new_user_notification( $user_id )`.
You're asking if I'm happy now? Dunno, but maybe you have learned something about pluggable functions, have you?
Props danielbachhuber.
Fixes <a href="https://core.trac.wordpress.org/ticket/34377">#34377</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.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 2015-11-24 21:59:23 UTC (rev 35734)
+++ trunk/src/wp-includes/pluggable.php 2015-11-24 23:06:03 UTC (rev 35735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1458,7 +1458,7 @@
</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"> $comment_content = wp_specialchars_decode( $comment->comment_content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1737,8 +1737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param null $deprecated Not used (argument deprecated).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $notify Optional. Type of notification that should happen. Accepts 'admin' or an empty
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * string (admin only), or 'both' (admin and user). The empty string value was kept
- * for backward-compatibility purposes with the renamed parameter. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * string (admin only), or 'both' (admin and user). Default empty.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $deprecated !== null ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1758,7 +1757,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
</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 ( 'admin' === $notify || empty( $notify ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation.
+ if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
</ins><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></span></pre></div>
<a id="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2015-11-24 21:59:23 UTC (rev 35734)
+++ trunk/tests/phpunit/tests/user.php 2015-11-24 23:06:03 UTC (rev 35735)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,8 +1040,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33654
</span><span class="cx" style="display: block; padding: 0 10px"> * @expectedDeprecated wp_new_user_notification
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
- wp_new_user_notification( self::$author_id, 'this_is_deprecated' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_wp_new_user_notification_old_signature_throws_deprecated_warning_but_sends() {
+ unset( $GLOBALS['phpmailer']->mock_sent );
+
+ $was_admin_email_sent = false;
+ $was_user_email_sent = false;
+ wp_new_user_notification( self::$contrib_id, 'this_is_a_test_password' );
+
+ /*
+ * Check to see if a notification email was sent to the
+ * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
+ */
+ if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
+ $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
+ $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
+ }
+
+ $this->assertTrue( $was_admin_email_sent );
+ $this->assertTrue( $was_user_email_sent );
</ins><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">+ /**
+ * Set up a user and try sending a notification using `wp_new_user_notification( $user );`.
+ *
+ * @ticket 34377
+ */
+ function test_wp_new_user_notification_old_signature_no_password() {
+ unset( $GLOBALS['phpmailer']->mock_sent );
+
+ $was_admin_email_sent = false;
+ $was_user_email_sent = false;
+ wp_new_user_notification( self::$contrib_id );
+
+ /*
+ * Check to see if a notification email was sent to the
+ * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
+ */
+ if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
+ $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
+ $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
+ }
+
+ $this->assertTrue( $was_admin_email_sent );
+ $this->assertFalse( $was_user_email_sent );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>