Ticket #31850: 31850.2.diff

src/wp-admin/includes/theme.php

@@ -578 +578 @@
                 if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
                         $customize_action = esc_url( add_query_arg(
                                 array(
-                                        'return' => urlencode( esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+                                        'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
                                 ),
                                 wp_customize_url( $slug )
                         ) );

src/wp-admin/menu.php

@@ -156 +156 @@
 $menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
         $submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
 
-        $customize_url = add_query_arg( 'return', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), 'customize.php' );
+        $customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
         $submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
 
         if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {

src/wp-admin/nav-menus.php

@@ -584 +584 @@
                                 ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
                                 esc_url( add_query_arg( array(
                                         array( 'autofocus' => $focus ),
-                                        'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+                                        'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
                                 ), admin_url( 'customize.php' ) ) ),
                                 __( 'Manage with Live Preview' )
                         );

src/wp-admin/widgets.php

@@ -353 +353 @@
                         esc_url( add_query_arg(
                                 array(
                                         array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-                                        'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+                                        'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) )
                                 ),
                                 admin_url( 'customize.php' )
                         ) ),