Changeset 36129

Timestamp:

12/31/2015 03:08:28 AM (9 years ago)

Author:

pento

Message:

Redirects: Prevent redirects if a queried object exists.

After [34659], it became possible to cause an incorrect redirect, by changing the slug of a post, then creating a new post with the old slug. The correct behaviour is to prevent redirecting to the old post.

Props dd32, pento.

Merge of [36128] to the 4.4 branch.

Fixes #35031.

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

@@ -4987 +4987 @@
     global $wp_query, $wp_rewrite;
 
+    if ( get_queried_object() ) {
+        return;
+    }
+
     if ( '' !== $wp_query->query_vars['name'] ) :
         global $wpdb;

branches/4.4/tests/phpunit/tests/rewrite/oldSlugRedirect.php

@@ -151 +151 @@
     }
 
+    /**
+     * @ticket 35031
+     */
+    public function test_old_slug_doesnt_redirect_when_reused() {
+        $old_permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
+        wp_update_post( array(
+            'ID' => $this->post_id,
+            'post_name' => 'bar-baz',
+        ) );
+
+        $new_post_id = self::factory()->post->create( array(
+            'post_title'   => 'Foo Bar',
+            'post_name'   => 'foo-bar',
+        ) );
+
+        $permalink = user_trailingslashit( get_permalink( $new_post_id ) );
+
+        $this->assertEquals( $old_permalink, $permalink );
+
+        $this->go_to( $old_permalink );
+        wp_old_slug_redirect();
+        $this->assertNull( $this->old_slug_redirect_url );
+    }
+
     public function filter_old_slug_redirect_url( $url ) {
         $this->old_slug_redirect_url = $url;