Changeset 36281 for branches/4.4

Timestamp:

01/13/2016 08:48:14 AM (9 years ago)

Author:

dd32

Message:

Canonical / Query: After [36280] remove the unit tests which are no longer supported for 4.4.
This also removes the is_feed() code to avoid confusion - only pages & embeds will be redirected.
See #35344

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/query.php

@@ -5028 +5028 @@
         $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() ) {

branches/4.4/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 );