Changeset 42964 for trunk/src/wp-login.php

Timestamp:

04/06/2018 07:09:53 PM (8 years ago)

Author:

azaozz

Message:

Privacy: fixes and updates for the method to confirm user requests by email.

• Improve function and variable names.
• Allow extra data to be passed with the request.
• Make the option/user meta names more consistent.
• Adds an inline comment explaining use of hash.

Props mikejolley.
See #43443.

File:

• trunk/src/wp-login.php (modified) (2 diffs)

trunk/src/wp-login.php

@@ -428 +428 @@
 
 // validate action so as to default to the login screen
-if ( ! in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login', 'emailconfirm' ), true ) && false === has_filter( 'login_form_' . $action ) ) {
+if ( ! in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login', 'verifyaccount' ), true ) && false === has_filter( 'login_form_' . $action ) ) {
         $action = 'login';
 }
@@ -859 +859 @@
                 break;
 
-        case 'emailconfirm' :
+        case 'verifyaccount' :
                 if ( isset( $_GET['confirm_action'], $_GET['confirm_key'], $_GET['uid'] ) ) {
-                        $action_name = sanitize_key( wp_unslash( $_GET['confirm_action'] ) );
                         $key         = sanitize_text_field( wp_unslash( $_GET['confirm_key'] ) );
                         $uid         = sanitize_text_field( wp_unslash( $_GET['uid'] ) );
-                        $result      = check_confirm_account_action_key( $action_name, $key, $uid );
+                        $action_name = sanitize_key( wp_unslash( $_GET['confirm_action'] ) );
+                        $result      = wp_check_account_verification_key( $key, $uid, $action_name );
                 } else {
                         $result = new WP_Error( 'invalid_key', __( 'Invalid key' ) );