Ticket #38331: patch-38331

Index: wp-includes/canonical.php
===================================================================
--- wp-includes/canonical.php   (revision 39483)
+++ wp-includes/canonical.php   (working copy)
@@ -368,7 +368,11 @@
                                unset( $_parsed_query['name'] );
                }
 
-               $_parsed_query = rawurlencode_deep( $_parsed_query );
+               $_parsed_query = array_combine(
+                       rawurlencode_deep( array_keys( $_parsed_query ) ),
+                       rawurlencode_deep( $_parsed_query)
+               );
+
                $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
        }
 
Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php   (revision 39483)
+++ wp-includes/functions.php   (working copy)
@@ -809,7 +809,12 @@
        }
 
        wp_parse_str( $query, $qs );
-       $qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
+ 
+       $qs = array_combine(
+               urlencode_deep( array_keys( $qs ) ),
+               urlencode_deep( $qs )
+       );
+
        if ( is_array( $args[0] ) ) {
                foreach ( $args[0] as $k => $v ) {
                        $qs[ $k ] = $v;