From 6b8b57dfbba737b99867a3bff03ff9a7cb951a7b Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 28 Mar 2021 10:22:10 +0000 Subject: [PATCH] Login and Registration: Add the "Error:" prefix to some password reset messages. This makes the messages more consistent with other error messages related to authentication and registration. Follow-up to [50589]. Props dd32. Fixes #52914. git-svn-id: https://develop.svn.wordpress.org/trunk@50611 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-login.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-login.php b/src/wp-login.php index 3d7769d4b1..14247e3d97 100644 --- a/src/wp-login.php +++ b/src/wp-login.php @@ -724,9 +724,9 @@ switch ( $action ) { if ( isset( $_GET['error'] ) ) { if ( 'invalidkey' === $_GET['error'] ) { - $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) ); + $errors->add( 'invalidkey', __( 'Error: Your password reset link appears to be invalid. Please request a new link below.' ) ); } elseif ( 'expiredkey' === $_GET['error'] ) { - $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) ); + $errors->add( 'expiredkey', __( 'Error: Your password reset link has expired. Please request a new link below.' ) ); } } @@ -842,7 +842,7 @@ switch ( $action ) { $errors = new WP_Error(); if ( isset( $_POST['pass1'] ) && $_POST['pass1'] !== $_POST['pass2'] ) { - $errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) ); + $errors->add( 'password_reset_mismatch', __( 'Error: The passwords do not match.' ) ); } /** @@ -1260,7 +1260,7 @@ switch ( $action ) { if ( isset( $_GET['loggedout'] ) && $_GET['loggedout'] ) { $errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' ); } elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) { - $errors->add( 'registerdisabled', __( 'User registration is currently not allowed.' ) ); + $errors->add( 'registerdisabled', __( 'Error: User registration is currently not allowed.' ) ); } elseif ( strpos( $redirect_to, 'about.php?updated' ) ) { $errors->add( 'updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {