Ticket #33920: 33920.diff

src/wp-includes/query.php

@@ -4725 +4725 @@
  *
  * @since 2.1.0
  *
- * @global WP_Query $wp_query Global WP_Query instance.
- * @global wpdb     $wpdb     WordPress database abstraction object.
+ * @global WP_Query   $wp_query   Global WP_Query instance.
+ * @global wpdb       $wpdb       WordPress database abstraction object.
+ * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
  */
 function wp_old_slug_redirect() {
-        global $wp_query;
+        global $wp_query, $wp_rewrite;
+
         if ( is_404() && '' != $wp_query->query_vars['name'] ) :
                 global $wpdb;
 
@@ -4767 +4769 @@
                 if ( ! $id )
                         return;
 
-                $link = get_permalink($id);
+                $link = get_permalink( $id );
+
+                // Add rewrite endpoints if necessary.
+                foreach ( $wp_rewrite->endpoints as $endpoint ) {
+                        if ( $endpoint[2] && false !== get_query_var( $endpoint[2], false ) ) {
+                                $link = user_trailingslashit( trailingslashit( $link ) . $endpoint[2] );
+                        }
+                }
+
+                /**
+                 * Filter the old slug redirect URL.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $link The redirect URL.
+                 */
+                $link = apply_filters( 'old_slug_redirect_url', $link );
 
-                if ( !$link )
+                if ( ! $link ) {
                         return;
+                }
 
                 wp_redirect( $link, 301 ); // Permanent redirect
                 exit;