<!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>[48315] trunk: Multisite: Delete the signup entry when a user is deleted from the database.</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/48315">48315</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/48315","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>2020-07-05 11:19:35 +0000 (Sun, 05 Jul 2020)</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'>Multisite: Delete the signup entry when a user is deleted from the database.
When a user has registered with incorrect data and got the account deleted immediately, it currently wasn't possible to register with the same login or email address again due to the existing signup entry. They had to wait for two days until the entry gets automatically deleted. Now the associated signup entry gets deleted as part of the account deletion.
Fixes <a href="https://core.trac.wordpress.org/ticket/43232">#43232</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmsdefaultfiltersphp">trunk/src/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitewpmuValidateUserSignupphp">trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmsdefaultfiltersphp"></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/ms-default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-filters.php 2020-07-05 11:11:46 UTC (rev 48314)
+++ trunk/src/wp-includes/ms-default-filters.php 2020-07-05 11:19:35 UTC (rev 48315)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'sanitize_user', 'strtolower' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'deleted_user', 'wp_delete_signup_on_user_delete', 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Roles.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'switch_blog', 'wp_switch_roles_and_user', 1, 2 );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></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/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2020-07-05 11:11:46 UTC (rev 48314)
+++ trunk/src/wp-includes/ms-functions.php 2020-07-05 11:19:35 UTC (rev 48315)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1277,6 +1277,21 @@
</span><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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Deletes am associated signup entry when a user is deleted from the database.
+ *
+ * @since 5.5.0
+ *
+ * @param int $id ID of the user to delete.
+ * @param int|null $reassign ID of the user to reassign posts and links to.
+ * @param WP_User $user User object.
+ */
+function wp_delete_signup_on_user_delete( $id, $reassign, $user ) {
+ global $wpdb;
+
+ $wpdb->delete( $wpdb->signups, array( 'user_login' => $user->user_login ) );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Create a user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function runs when a user self-registers as well as when
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpmuValidateUserSignupphp"></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/multisite/wpmuValidateUserSignup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2020-07-05 11:11:46 UTC (rev 48314)
+++ trunk/tests/phpunit/tests/multisite/wpmuValidateUserSignup.php 2020-07-05 11:19:35 UTC (rev 48315)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,9 +84,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_fail_for_existing_signup_with_same_username() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't send notifications.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_signup_user( 'foo123', 'foo@example.com' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $v = wpmu_validate_user_signup( 'foo123', 'foo2@example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'user_name', $v['errors']->get_error_codes() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,9 +94,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_not_fail_for_existing_signup_with_same_username_if_signup_is_old() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't send notifications.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_signup_user( 'foo123', 'foo@example.com' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $date = gmdate( 'Y-m-d H:i:s', time() - ( 2 * DAY_IN_SECONDS ) - 60 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +108,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_fail_for_existing_signup_with_same_email() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't send notifications.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_signup_user( 'foo123', 'foo@example.com' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $v = wpmu_validate_user_signup( 'foo2', 'foo@example.com' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'user_email', $v['errors']->get_error_codes() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,9 +118,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_should_not_fail_for_existing_signup_with_same_email_if_signup_is_old() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't send notifications.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_signup_user( 'foo123', 'foo@example.com' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'wpmu_signup_user_notification', '__return_true' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $date = gmdate( 'Y-m-d H:i:s', time() - ( 2 * DAY_IN_SECONDS ) - 60 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,6 +130,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( 'user_email', $v['errors']->get_error_codes() );
</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">+ /**
+ * @ticket 43232
+ */
+ public function test_should_not_fail_for_data_used_by_a_deleted_user() {
+ global $wpdb;
+
+ // Don't send notifications.
+ add_filter( 'wpmu_signup_user_notification', '__return_false' );
+ add_filter( 'wpmu_welcome_user_notification', '__return_false' );
+
+ // Signup, activate and delete new user.
+ wpmu_signup_user( 'foo123', 'foo@example.com' );
+ $key = $wpdb->get_var( "SELECT activation_key FROM $wpdb->signups WHERE user_login = 'foo123'" );
+ $user = wpmu_activate_signup( $key );
+ wpmu_delete_user( $user['user_id'] );
+
+ $valid = wpmu_validate_user_signup( 'foo123', 'foo2@example.com' );
+
+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
+ remove_filter( 'wpmu_signup_user_notification', '__return_false' );
+
+ $this->assertNotContains( 'user_name', $valid['errors']->get_error_codes() );
+ $this->assertNotContains( 'user_email', $valid['errors']->get_error_codes() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_email_address_with_no_banned_domains_results_in_error() {
</span><span class="cx" style="display: block; padding: 0 10px"> $valid = wpmu_validate_user_signup( 'validusername', 'invalid-email' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>