Ticket #21600: 21600.patch

wp-includes/taxonomy.php

@@ -331 +331 @@
         if ( false !== $args['query_var'] && !empty($wp) ) {
                 if ( true === $args['query_var'] )
                         $args['query_var'] = $taxonomy;
-                $args['query_var'] = sanitize_title_with_dashes($args['query_var']);
+                else
+                        $args['query_var'] = sanitize_title_with_dashes($args['query_var']);
                 $wp->add_query_var($args['query_var']);
         }
 

wp-includes/post.php

@@ -1042 +1042 @@
         if ( false !== $args->query_var && !empty($wp) ) {
                 if ( true === $args->query_var )
                         $args->query_var = $post_type;
-                $args->query_var = sanitize_title_with_dashes($args->query_var);
+                else
+                        $args->query_var = sanitize_title_with_dashes($args->query_var);
                 $wp->add_query_var($args->query_var);
         }