Changeset 46839 for branches/5.3/src/wp-login.php

Timestamp:

12/09/2019 01:28:13 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Users: Introduce admin_email_remind_interval filter for dismissing the admin email confirmation screen.

Props desrosj, birgire.
Merges [46838], [46837] to the 5.3 branch.
Fixes #48334.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-login.php (modified) (6 diffs)

branches/5.3/src/wp-login.php

@@ -570 +570 @@
         }
 
+        /**
+         * Filters the interval for dismissing the admin email confirmation screen.
+         *
+         * If `0` (zero) is returned, the "Remind me later" link will not be displayed.
+         *
+         * @since 5.3.1
+         *
+         * @param int $interval Interval time (in seconds). Default is 3 days.
+         */
+        $remind_interval = (int) apply_filters( 'admin_email_remind_interval', 3 * DAY_IN_SECONDS );
+
         if ( ! empty( $_GET['remind_me_later'] ) ) {
             if ( ! wp_verify_nonce( $_GET['remind_me_later'], 'remind_me_later_nonce' ) ) {
@@ -576 +587 @@
             }
 
-            // "Remind me later" is a bit ambiguous. Three days later?
-            update_option( 'admin_email_lifespan', time() + 3 * DAY_IN_SECONDS );
+            if ( $remind_interval > 0 ) {
+                update_option( 'admin_email_lifespan', time() + $remind_interval );
+            }
 
             wp_safe_redirect( $redirect_to );
@@ -591 +603 @@
             /**
              * Filters the interval for redirecting the user to the admin email confirmation screen.
+             *
              * If `0` (zero) is returned, the user will not be redirected.
              *
              * @since 5.3.0
              *
-             * @param int Interval time (in seconds).
+             * @param int $interval Interval time (in seconds). Default is 6 months.
              */
             $admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
@@ -610 +623 @@
 
         /**
-        * Fires before the admin email confirm form.
-        *
-        * @since 5.3.0
-        *
-        * @param WP_Error $errors A `WP_Error` object containing any errors generated by using invalid credentials. Note that the error object may not contain any errors.
-        */
+         * Fires before the admin email confirm form.
+         *
+         * @since 5.3.0
+         *
+         * @param WP_Error $errors A `WP_Error` object containing any errors generated by using invalid
+         *                         credentials. Note that the error object may not contain any errors.
+         */
         do_action( 'admin_email_confirm', $errors );
 
@@ -623 +637 @@
             <?php
             /**
-            * Fires inside the admin-email-confirm-form form tags, before the hidden fields.
-            *
-            * @since 5.3.0
-            */
+             * Fires inside the admin-email-confirm-form form tags, before the hidden fields.
+             *
+             * @since 5.3.0
+             */
             do_action( 'admin_email_confirm_form' );
 
@@ -682 +696 @@
                     <input type="submit" name="correct-admin-email" id="correct-admin-email" class="button button-primary button-large" value="<?php esc_attr_e( 'The email is correct' ); ?>" />
                 </div>
-                <div class="admin-email__actions-secondary">
-                    <?php
-
-                    $remind_me_link = wp_login_url( $redirect_to );
-                    $remind_me_link = add_query_arg(
-                        array(
-                            'action'          => 'confirm_admin_email',
-                            'remind_me_later' => wp_create_nonce( 'remind_me_later_nonce' ),
-                        ),
-                        $remind_me_link
-                    );
-
-                    ?>
-                    <a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a>
-                </div>
+                <?php if ( $remind_interval > 0 ) : ?>
+                    <div class="admin-email__actions-secondary">
+                        <?php
+
+                        $remind_me_link = wp_login_url( $redirect_to );
+                        $remind_me_link = add_query_arg(
+                            array(
+                                'action'          => 'confirm_admin_email',
+                                'remind_me_later' => wp_create_nonce( 'remind_me_later_nonce' ),
+                            ),
+                            $remind_me_link
+                        );
+
+                        ?>
+                        <a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a>
+                    </div>
+                <?php endif; ?>
             </div>
         </form>