Ticket #48153: 48153.3.diff

src/wp-login.php

@@ -589 +589 @@
                         }
 
                         /**
-                         * Filters the interval for redirecting the user to the admin email confirmation screen.
-                         * If `0` (zero), or any "falsey" value is returned, the user will not be redirected.
+                         * Filters the interval for redirecting the user to the admin email verification screen.
+                         * If `0` or a negative value is returned, the email verification screen will
+                         * be shown again next time an administrator logs in.
                          *
                          * @since 5.3.0
                          *
@@ -598 +599 @@
                          */
                         $admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
 
-                        if ( $admin_email_check_interval > 0 ) {
-                                update_option( 'admin_email_lifespan', time() + $admin_email_check_interval );
-                        }
+                        update_option( 'admin_email_lifespan', time() + $admin_email_check_interval );
 
                         wp_safe_redirect( $redirect_to );
                         exit;
@@ -1232 +1231 @@
                                 exit;
                         }
 
-                        /**
-                         * Filters the capability required for displaying the admin email check screen.
-                         *
-                         * @since 5.3.0
-                         *
-                         * @param string $capability The capability required to display the admin email check screen.
-                         */
-                        $admin_check_cap = apply_filters( 'admin_email_check_cap', 'manage_options' );
+                        // Check if it is time to add a redirect to the admin email verification screen.
+                        if ( is_a( $user, 'WP_User' ) && $user->exists() && $user->has_cap( 'manage_options' ) ) {
+                                /**
+                                 * Filters whether the user should be redirected to the verification screen. Can also be used
+                                 * to disable this functionality completely.
+                                 *
+                                 * @since 5.3.0
+                                 *
+                                 * @param bool    True to redirect, false otherwise.
+                                 * @param WP_User WP_User object.
+                                 */
+                                $show_verification = (bool) apply_filters( 'show_admin_email_verification', true, $user );
 
-                        // Check if it is time to add a redirect to the admin email confirmation screen.
-                        if ( is_a( $user, 'WP_User' ) && $user->exists() && $user->has_cap( $admin_check_cap ) ) {
-                                $admin_email_lifespan = (int) get_option( 'admin_email_lifespan' );
+                                if ( $show_verification ) {
+                                        $admin_email_lifespan = (int) get_option( 'admin_email_lifespan' );
 
-                                /** This filter is documented in wp-login.php */
-                                $admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
-
-                                if ( $admin_email_check_interval > 0 && time() > $admin_email_lifespan ) {
-                                        $redirect_to = add_query_arg( 'action', 'confirm_admin_email', wp_login_url( $redirect_to ) );
+                                        if ( time() > $admin_email_lifespan ) {
+                                                $redirect_to = add_query_arg( 'action', 'confirm_admin_email', wp_login_url( $redirect_to ) );
+                                        }
                                 }
                         }