Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-23 07:51:49 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Props desrosj, birgire.
Fixes #48334.
Built from https://develop.svn.wordpress.org/trunk@46838


git-svn-id: http://core.svn.wordpress.org/trunk@46638 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-12-09 13:26:02 +00:00
parent adf1792adc
commit 87a759b81c
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-46837'; $wp_version = '5.4-alpha-46838';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

44
wp-login.php
View File

@ -581,14 +581,26 @@ switch ( $action ) {
exit; exit;
} }
/**
* 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 ( ! empty( $_GET['remind_me_later'] ) ) {
if ( ! wp_verify_nonce( $_GET['remind_me_later'], 'remind_me_later_nonce' ) ) { if ( ! wp_verify_nonce( $_GET['remind_me_later'], 'remind_me_later_nonce' ) ) {
wp_safe_redirect( wp_login_url() ); wp_safe_redirect( wp_login_url() );
exit; exit;
} }
// "Remind me later" is a bit ambiguous. Three days later? if ( $remind_interval > 0 ) {
update_option( 'admin_email_lifespan', time() + 3 * DAY_IN_SECONDS ); update_option( 'admin_email_lifespan', time() + $remind_interval );
}
wp_safe_redirect( $redirect_to ); wp_safe_redirect( $redirect_to );
exit; exit;
@ -695,21 +707,23 @@ switch ( $action ) {
<a class="button button-large" href="<?php echo esc_url( $change_link ); ?>"><?php _e( 'Update' ); ?></a> <a class="button button-large" href="<?php echo esc_url( $change_link ); ?>"><?php _e( 'Update' ); ?></a>
<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' ); ?>" /> <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>
<div class="admin-email__actions-secondary"> <?php if ( $remind_interval > 0 ) : ?>
<?php <div class="admin-email__actions-secondary">
<?php
$remind_me_link = wp_login_url( $redirect_to ); $remind_me_link = wp_login_url( $redirect_to );
$remind_me_link = add_query_arg( $remind_me_link = add_query_arg(
array( array(
'action' => 'confirm_admin_email', 'action' => 'confirm_admin_email',
'remind_me_later' => wp_create_nonce( 'remind_me_later_nonce' ), 'remind_me_later' => wp_create_nonce( 'remind_me_later_nonce' ),
), ),
$remind_me_link $remind_me_link
); );
?> ?>
<a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a> <a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a>
</div> </div>
<?php endif; ?>
</div> </div>
</form> </form>