diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css index fc139f579c..12590f27f4 100644 --- a/src/wp-admin/css/login.css +++ b/src/wp-admin/css/login.css @@ -131,6 +131,17 @@ p { box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13); } +.login-action-confirm_admin_email #login { + width: 60vw; + margin-top: -2vh; +} + +@media screen and (max-width: 782px) { + .login-action-confirm_admin_email #login { + width: 100vw; + } +} + .login form .forgetmenot { font-weight: 400; float: left; @@ -141,6 +152,36 @@ p { float: right; } +.login .admin-email-confirm-form .submit { + text-align: center; +} + +.admin-email__later { + text-align: left; +} + +.login form p.admin-email__details { + margin: 1.1em 0; +} + +.login h1.admin-email__heading { + border-bottom: 1px rgb(241, 241, 241) solid; + color: rgb(95, 95, 95); + font-weight: normal; + padding-bottom: 0.5em; + text-align: left; +} + +.admin-email__actions div { + padding-top: 1.5em; +} + +.login .admin-email__actions .button-primary { + float: none; + margin-left: 0.25em; + margin-right: 0.25em; +} + #login form p { margin-bottom: 0; } diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 281aa68b86..90e10d2f4b 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -815,6 +815,10 @@ function upgrade_all() { upgrade_510(); } + if ( $wp_current_db_version < 45744 ) { + upgrade_530(); + } + maybe_disable_link_manager(); maybe_disable_automattic_widgets(); @@ -2114,6 +2118,19 @@ function upgrade_510() { delete_site_option( 'upgrade_500_was_gutenberg_active' ); } +/** + * Executes changes made in WordPress 5.3.0. + * + * @ignore + * @since 5.3.0 + */ +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 ); +} + /** * Executes network-level upgrade routines. * diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php index 633aa92dc2..fe882b83f7 100644 --- a/src/wp-admin/options-general.php +++ b/src/wp-admin/options-general.php @@ -108,7 +108,7 @@ if ( ! is_multisite() ) {
The new address will not become active until confirmed.' ); ?>
has_errors() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) { + if ( $shake_error_codes && $wp_error->has_errors() && in_array( $wp_error->get_error_code(), $shake_error_codes, true ) ) { add_action( 'login_head', 'wp_shake_js', 12 ); } @@ -98,7 +98,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) { * This could be added by add_action('login_head'...) like wp_shake_js(), * but maybe better if it's not removable by plugins. */ - if ( 'loggedout' == $wp_error->get_error_code() ) { + if ( 'loggedout' === $wp_error->get_error_code() ) { ?>