Changeset 45788

Timestamp:

08/13/2019 05:39:06 PM (5 years ago)

Author:

azaozz

Message:

Admin email verification:

• Add the admin_email_lifespan option when installing. Fixes a bug where the verification screen is shown right after installation.
• Reset the same option when upgrading and the user doing the DB upgrade is not an admin. This will ensure the email verification is shown next time an admin logs in.
• Use site_url() instead of network_site_url() for the form action. The latter seems needed only for password reset.

See #46349.

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -543 +543 @@
         // 4.9.8
         'show_comments_cookies_opt_in'    => 1,
+
+        // 5.3.0
+        'admin_email_lifespan'            => ( time() + 6 * MONTH_IN_SECONDS ),
     );
 

trunk/src/wp-admin/includes/upgrade.php

@@ -2126 +2126 @@
  */
 function upgrade_530() {
-    // Do `add_option()` rather than overwriting with `update_option()` as this may run
-    // after an admin was redirected to the email verification screen,
-    // and the option was updated.
-    add_option( 'admin_email_lifespan', 0 );
+    // The `admin_email_lifespan` option may have been set by an admin that just logged in,
+    // saw the verification screen, clicked on a button there, and is now upgrading the db,
+    // or by populate_options() that is called earlier in upgrade_all(). 
+    // In the second case `admin_email_lifespan` should be reset so the verification screen
+    // is shown next time an admin logs in.
+    if ( function_exists( 'current_user_can' ) && ! current_user_can( 'manage_options' ) ) {
+        update_option( 'admin_email_lifespan', 0 );
+    }
 }
 

trunk/src/wp-login.php

@@ -595 +595 @@
              * @param int Interval time (in seconds).
              */
-            $admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 180 * DAY_IN_SECONDS );
+            $admin_email_check_interval = (int) apply_filters( 'admin_email_check_interval', 6 * MONTH_IN_SECONDS );
 
             if ( $admin_email_check_interval > 0 ) {
@@ -618 +618 @@
         ?>
 
-        <form class="admin-email-confirm-form" name="admin-email-confirm-form" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=confirm_admin_email', 'login_post' ) ); ?>" method="post">
+        <form class="admin-email-confirm-form" name="admin-email-confirm-form" action="<?php echo esc_url( site_url( 'wp-login.php?action=confirm_admin_email', 'login_post' ) ); ?>" method="post">
             <?php
             /**