Changeset 37075

Timestamp:

03/23/2016 09:53:44 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Canonical / Query: Restore the is_404() check in wp_old_slug_redirect() which was removed in [34659].
This reverts part of [34659] due to excessive canonical problems it's caused in 4.4.x.

Remove the unit tests which are no longer supported.
This also removes the is_feed() code to avoid confusion - only pages & embeds will be redirected.

Merges [36280] and [36281] to trunk.

Props dd32.
See #21602, #35344.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/rewrite/oldSlugRedirect.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -4886 +4886 @@
  * @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, $wp_rewrite;
-
-    if ( get_queried_object() ) {
-        return;
-    }
-
-    if ( '' !== $wp_query->query_vars['name'] ) :
+    global $wp_query;
+
+    if ( is_404() && '' !== $wp_query->query_vars['name'] ) :
         global $wpdb;
 
@@ -4937 +4932 @@
         $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 ) {
+        if ( 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_embed() ) {
             $link = user_trailingslashit( trailingslashit( $link ) . 'embed' );
-        } 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] );
-                }
-            }
         }
 

trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php

@@ -45 +45 @@
 
         $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
-
-        $this->go_to( $old_permalink );
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_endpoint() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
-
-        $this->go_to( $old_permalink );
-        $GLOBALS['wp_query']->query_vars['custom-endpoint'] = true;
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_endpoint_custom_query_var() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
-
-        $this->go_to( $old_permalink );
-        $GLOBALS['wp_query']->query_vars['custom'] = true;
-        wp_old_slug_redirect();
-        $this->assertEquals( $permalink, $this->old_slug_redirect_url );
-    }
-
-    public function test_old_slug_redirect_feed() {
-        $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
-
-        wp_update_post( array(
-            'ID' => $this->post_id,
-            'post_name' => 'bar-baz',
-        ) );
-
-        $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
 
         $this->go_to( $old_permalink );