Changeset 37165

Timestamp:

04/07/2016 07:21:02 PM (11 years ago)

Author:

boonebgorges

Message:

Use __trashed suffix rather than -%trashed% for trashed post slugs.

Percent signs are reserved characters in URIs. As such, it was impossible for
plugins to route requests to trashed posts, as happens in bbPress. The new
__trashed suffix should be sufficiently unique.

Also adds a test that demonstrates that the __trashed suffix can be
appended to slugs that contain the suffix somewhere other than the end of
the string.

Props netweb, ericlewis.
Fixes #11863.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post/wpInsertPost.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -6127 +6127 @@
         $post = get_post( $post );
 
-        if ( strpos( $post->post_name, '-%trashed%' ) ) {
+        if ( '__trashed' === substr( $post->post_name, -9 ) ) {
                 return $post->post_name;
         }
         add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name );
-        $post_name = _truncate_post_slug( $post->post_name, 190 ) . '-%trashed%';
+        $post_name = _truncate_post_slug( $post->post_name, 191 ) . '__trashed';
         $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
         clean_post_cache( $post->ID );

trunk/tests/phpunit/tests/post/wpInsertPost.php

@@ -16 +16 @@
                 ) );
                 wp_trash_post( $trashed_about_page_id );
-                $this->assertEquals( 'about-%trashed%', get_post( $trashed_about_page_id )->post_name );
+                $this->assertEquals( 'about__trashed', get_post( $trashed_about_page_id )->post_name );
+        }
+
+        /**
+         * @ticket 11863
+         */
+        public function test_trashed_suffix_should_be_added_to_post_with__trashed_in_slug() {
+                $trashed_about_page_id = self::factory()->post->create( array(
+                        'post_type' => 'page',
+                        'post_title' => 'About',
+                        'post_status' => 'publish',
+                        'post_name' => 'foo__trashed__foo',
+                ) );
+                wp_trash_post( $trashed_about_page_id );
+                $this->assertEquals( 'foo__trashed__foo__trashed', get_post( $trashed_about_page_id )->post_name );
         }
 
@@ -50 +64 @@
                 ) );
 
-                $this->assertEquals( 'about-%trashed%', get_post( $trashed_about_page_id )->post_name );
+                $this->assertEquals( 'about__trashed', get_post( $trashed_about_page_id )->post_name );
                 $this->assertEquals( 'about', get_post( $about_page_id )->post_name );
         }