Ticket #20143: canonical.diff

canonical.php

@@ -280 +280 @@
                                 unset( $_parsed_query['name'] );
                 }
 
-                $_parsed_query = array_map( 'rawurlencode', $_parsed_query );
+                array_walk_recursive( $_parsed_query, 'rawurlencode_callback' );
                 $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
         }
 
@@ -495 +495 @@
 }
 
 add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
+
+function rawurlencode_callback(&$string, $key = null) {
+        $string = rawurlencode($string);
+}