Changeset 49272

Timestamp:

10/22/2020 02:41:33 AM (4 years ago)

Author:

TimothyBlynJacobs

Message:

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

Props TimothyBlynJacobs, georgestephanis.
Fixes #51581.

File:

• trunk/src/wp-admin/authorize-application.php (modified) (3 diffs)

trunk/src/wp-admin/authorize-application.php

@@ -23 +23 @@
     if ( isset( $_POST['reject'] ) ) {
         if ( $reject_url ) {
-            $redirect = add_query_arg( 'success', 'false', $reject_url );
+            $redirect = $reject_url;
         } else {
             $redirect = admin_url();
@@ -58 +58 @@
 $app_name    = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : '';
 $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' );
@@ -231 +239 @@
                             /* translators: %s: The URL the user is being redirected to. */
                             __( 'You will be sent to %s' ),
-                            '<strong><kbd>' . esc_html(
-                                add_query_arg(
-                                    array(
-                                        'success' => 'false',
-                                    ),
-                                    $reject_url
-                                )
-                            ) . '</kbd></strong>'
+                            '<strong><kbd>' . esc_html( $reject_url ) . '</kbd></strong>'
                         );
                     } else {