sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

git-svn-id: https://develop.svn.wordpress.org/branches/5.3@46839 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-12-09 13:28:13 +00:00
parent 1459e32c00
commit 0f26af82c0
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wp-login.php
View File

@ -569,14 +569,26 @@ switch ( $action ) {
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 ( ! wp_verify_nonce( $_GET['remind_me_later'], 'remind_me_later_nonce' ) ) {
wp_safe_redirect( wp_login_url() );
exit;
}
// "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 );
exit;
@ -590,11 +602,12 @@ switch ( $action ) {
/**
* 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 );
@ -613,7 +626,8 @@ switch ( $action ) {
*
* @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.
* @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 );
@ -681,6 +695,7 @@ switch ( $action ) {
<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' ); ?>" />
</div>
<?php if ( $remind_interval > 0 ) : ?>
<div class="admin-email__actions-secondary">
<?php
@ -696,6 +711,7 @@ switch ( $action ) {
?>
<a href="<?php echo esc_url( $remind_me_link ); ?>"><?php _e( 'Remind me later' ); ?></a>
</div>
<?php endif; ?>
</div>
</form>