Ticket #21841: 21841.patch

wp-includes/canonical.php

@@ -294 +294 @@
         $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
         if ( $redirect_url && !empty($redirect['query']) ) {
                 parse_str( $redirect['query'], $_parsed_query );
+                $redirect_url = str_replace( '&', '&', $redirect_url );
                 $redirect = @parse_url($redirect_url);
 
                 if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {