WordPress.org

Make WordPress Core

Changeset 36281


Ignore:
Timestamp:
01/13/2016 08:48:14 AM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.4/src/wp-includes/query.php

    r36280 r36281  
    50285028        $link = get_permalink( $id );
    50295029
    5030         if ( is_feed() ) {
    5031             $link = user_trailingslashit( trailingslashit( $link ) . 'feed' );
    5032         } elseif ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) {
     5030        if ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) {
    50335031            $link = user_trailingslashit( trailingslashit( $link ) . 'page/' . $GLOBALS['wp_query']->query_vars['paged'] );
    50345032        } elseif( is_embed() ) {
  • branches/4.4/tests/phpunit/tests/rewrite/oldSlugRedirect.php

    r36129 r36281  
    4545
    4646        $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
    47 
    48         $this->go_to( $old_permalink );
    49         wp_old_slug_redirect();
    50         $this->assertEquals( $permalink, $this->old_slug_redirect_url );
    51     }
    52 
    53     public function test_old_slug_redirect_endpoint() {
    54         $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
    55 
    56         wp_update_post( array(
    57             'ID' => $this->post_id,
    58             'post_name' => 'bar-baz',
    59         ) );
    60 
    61         $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'custom-endpoint' );
    62 
    63         $this->go_to( $old_permalink );
    64         $GLOBALS['wp_query']->query_vars['custom-endpoint'] = true;
    65         wp_old_slug_redirect();
    66         $this->assertEquals( $permalink, $this->old_slug_redirect_url );
    67     }
    68 
    69     public function test_old_slug_redirect_endpoint_custom_query_var() {
    70         $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
    71 
    72         wp_update_post( array(
    73             'ID' => $this->post_id,
    74             'post_name' => 'bar-baz',
    75         ) );
    76 
    77         $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'second-endpoint' );
    78 
    79         $this->go_to( $old_permalink );
    80         $GLOBALS['wp_query']->query_vars['custom'] = true;
    81         wp_old_slug_redirect();
    82         $this->assertEquals( $permalink, $this->old_slug_redirect_url );
    83     }
    84 
    85     public function test_old_slug_redirect_feed() {
    86         $old_permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
    87 
    88         wp_update_post( array(
    89             'ID' => $this->post_id,
    90             'post_name' => 'bar-baz',
    91         ) );
    92 
    93         $permalink = user_trailingslashit( trailingslashit( get_permalink( $this->post_id ) ) . 'feed' );
    9447
    9548        $this->go_to( $old_permalink );
Note: See TracChangeset for help on using the changeset viewer.