Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

App Passwords: Fix success=false not being appended to fallback reject url.

Browse Source 
Props TimothyBlynJacobs, georgestephanis.
Fixes #51581.

Built from https://develop.svn.wordpress.org/trunk@49272


git-svn-id: http://core.svn.wordpress.org/trunk@49034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
TimothyBlynJacobs 2020-10-22 02:44:05 +00:00
parent 9dc6d6147a
commit fe8bb3ea58
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-admin/authorize-application.php
View File

@ -22,7 +22,7 @@ if ( isset( $_POST['action'] ) && 'authorize_application_password' === $_POST['a
if ( isset( $_POST['reject'] ) ) { if ( isset( $_POST['reject'] ) ) {
if ( $reject_url ) { if ( $reject_url ) {
$redirect = add_query_arg( 'success', 'false', $reject_url ); $redirect = $reject_url;
} else { } else {
$redirect = admin_url(); $redirect = admin_url();
} }
@ -57,8 +57,16 @@ $title = __( 'Authorize Application' );
$app_name = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : ''; $app_name = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : '';
$success_url = ! empty( $_REQUEST['success_url'] ) ? $_REQUEST['success_url'] : null; $success_url = ! empty( $_REQUEST['success_url'] ) ? $_REQUEST['success_url'] : null;
$reject_url = ! empty( $_REQUEST['reject_url'] ) ? $_REQUEST['reject_url'] : $success_url;
$user = wp_get_current_user(); if ( ! empty( $_REQUEST['reject_url'] ) ) {
$reject_url = $_REQUEST['reject_url'];
} elseif ( $success_url ) {
$reject_url = add_query_arg( 'success', 'false', $success_url );
} else {
$reject_url = null;
}
$user = wp_get_current_user();
$request = compact( 'app_name', 'success_url', 'reject_url' ); $request = compact( 'app_name', 'success_url', 'reject_url' );
$is_valid = wp_is_authorize_application_password_request_valid( $request, $user ); $is_valid = wp_is_authorize_application_password_request_valid( $request, $user );
@ -230,14 +238,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
printf( printf(
/* translators: %s: The URL the user is being redirected to. */ /* translators: %s: The URL the user is being redirected to. */
__( 'You will be sent to %s' ), __( 'You will be sent to %s' ),
'<strong><kbd>' . esc_html( '<strong><kbd>' . esc_html( $reject_url ) . '</kbd></strong>'
add_query_arg(
array(
'success' => 'false',
),
$reject_url
)
) . '</kbd></strong>'
); );
} else { } else {
_e( 'You will be returned to the WordPress Dashboard, and no changes will be made.' ); _e( 'You will be returned to the WordPress Dashboard, and no changes will be made.' );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-beta1-49271'; $wp_version = '5.6-beta1-49272';
/** /**
* 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.