Ticket #35031: 35031.2.diff

src/wp-includes/query.php

@@ -5009 +5009 @@
                                         $link = user_trailingslashit( trailingslashit( $link ) . $endpoint[1] );
                                 }
                         }
+                } else {
+                        // If it's not an endpoint or a 404, there's something else associated with this URL. Let's not redirect anywhere.
+                        return;
                 }
 
                 /**