Changeset 10940 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

Timestamp:

04/30/2021 08:11:45 AM (4 years ago)

Author:

dd32

Message:

Login: When blocking users from the Admin UI, reference them by ID rather than by email to simplify some logic.

This also allows switching prior to including bbPress, avoiding issues related to code that sets all users as bbp_participant & [10939].

Follow up to [10928].

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -244 +244 @@
 
         } else {
-            $url = add_query_arg(
-                'email',
-                urlencode( $item->user_email ),
+            // Account created, find the user.
+            $user = get_user_by( 'login', $item->user_login );
+
+            $url = add_query_arg(
+                'user_id',
+                urlencode( $user->ID ),
                 admin_url( 'admin-post.php?action=login_block_account' )
             );
-            $url = wp_nonce_url( $url, 'block_account_' . $item->user_email );
-
-            if (
-                ! ( $user = get_user_by( 'login', $item->user_login ) ) ||
-                'BLOCKED' !== substr( $user->user_pass, 0, 7 )
-            ) {
+            $url = wp_nonce_url( $url, 'block_account_' . $user->ID );
+
+            if ( $user && 'BLOCKED' !== substr( $user->user_pass, 0, 7 ) ) {
                 $row_actions['block-account'] = '<a href="' . esc_url( $url ) . '">Block Account</a>';
             }