Changeset 34659 for trunk/src/wp-includes/query.php

Timestamp:

09/28/2015 06:56:54 AM (9 years ago)

Author:

pento

Message:

Rewrite: When redirecting old slugs, include URL endpoints.

Historically, wp_old_slug_redirect() has only ever redirected the old slug of posts, it hasn't included URL endpoints, or worked with comment feed URLs. By adding support for these, we ensure a greater range of URLs aren't killed when the slug changes.

Props swissspdy.

Fixes #33920.

File:

• trunk/src/wp-includes/query.php (modified) (2 diffs)

trunk/src/wp-includes/query.php

@@ -4726 +4726 @@
  * @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;
-    if ( is_404() && '' != $wp_query->query_vars['name'] ) :
+    global $wp_query, $wp_rewrite;
+
+    if ( '' !== $wp_query->query_vars['name'] ) :
         global $wpdb;
 
@@ -4768 +4770 @@
             return;
 
-        $link = get_permalink($id);
-
-        if ( !$link )
+        $link = get_permalink( $id );
+
+        if ( is_feed() ) {
+            $link = user_trailingslashit( trailingslashit( $link ) . 'feed' );
+        } elseif ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) {
+            $link = user_trailingslashit( trailingslashit( $link ) . 'page/' . $GLOBALS['wp_query']->query_vars['paged'] );
+        } elseif ( is_404() ) {
+            // 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[1] );
+                }
+            }
+        }
+
+        /**
+         * 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 ) {
             return;
+        }
 
         wp_redirect( $link, 301 ); // Permanent redirect