Ticket #35344: 35344.diff

src/wp-includes/query.php

@@ -4956 +4956 @@
 function wp_old_slug_redirect() {
         global $wp_query, $wp_rewrite;
 
-        if ( get_queried_object() ) {
-                return;
-        }
-
         if ( '' !== $wp_query->query_vars['name'] ) :
                 global $wpdb;
 
@@ -5015 +5011 @@
                                         $link = user_trailingslashit( trailingslashit( $link ) . $endpoint[1] );
                                 }
                         }
+                } else {
+                        // If it wasn't a 404, then it's going to be handled elsewhere.
+                        return;
                 }
 
                 /**