Ticket #32692: 32692.2.patch

wp-admin/customize.php

@@ -21 +21 @@
 $url = wp_validate_redirect( $url, home_url( '/' ) );
 if ( $return ) {
         $return = wp_unslash( $return );
+        $return = wp_admin_canonical_url( $return, false );
         $return = wp_validate_redirect( $return );
 }
 if ( ! $return ) {

wp-admin/includes/misc.php

@@ -864 +864 @@
  *
  * @since 4.2.0
  */
-function wp_admin_canonical_url() {
+function wp_admin_canonical_url($url = '', $print = true) {
         $removable_query_args = array(
                 'message', 'settings-updated', 'saved',
                 'update', 'updated', 'activated',
@@ -888 +888 @@
         }
 
         // Ensure we're using an absolute URL.
-        $current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+        if( empty( $url ) ) {
+                $current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+        } else {
+                $current_url = $url;
+        }
         $filtered_url = remove_query_arg( $removable_query_args, $current_url );
+        if( true === $print ) {
         ?>
         <link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
         <script>
@@ -898 +903 @@
                 }
         </script>
 <?php
+        } else {
+                return esc_url( $filtered_url );
+        }
 }