Changeset 36607 for trunk/src/wp-includes/post.php

Timestamp:

02/21/2016 09:44:14 PM (9 years ago)

Author:

ericlewis

Message:

Posts: Non-trashed posts should take slug priority over trashed posts.

When determining a unique post slug, trashed posts are taken into account. Previously, new posts would add suffixes to their slugs (e.g. about-2) when a post in the trash had the desired slug (e.g. about).

To avoid this behavior, when a post is trashed its slug (i.e. post_name) is now suffixed with -%trashed%. The post's pre-trash slug is stored as post meta, and if the post is restored from trash, its desired slug is reapplied.

For existing trashed posts which don't have the -%trashed% suffix, the suffix is added when a post with its desired slug is created.

Props ocean90, boonebgorges, ryan, SergeyBiryukov, coffee2code, helen, williamsba1.
See #11863.

File:

• trunk/src/wp-includes/post.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -3242 +3242 @@
     $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
 
+    /*
+     * If the post is being untrashed and it has a desired slug stored in post meta,
+     * reassign it.
+     */
+    if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
+        $desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
+        if ( $desired_post_slug ) {
+            delete_post_meta( $post_ID, '_wp_desired_post_slug' );
+            $post_name = $desired_post_slug;
+        }
+    }
+
+    // If a trashed post has the desired slug, change it and let this post have it.
+    if ( 'trash' !== $post_status && $post_name ) {
+        wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID );
+    }
+
+    // When trashing an existing post, change its slug to allow non-trashed posts to use it.
+    if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) {
+        $post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID );
+    }
+
     $post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
 
@@ -6034 +6056 @@
     }
 }
+
+/**
+ * If any trashed posts have a given slug, add a suffix.
+ *
+ * Store its desired (i.e. current) slug so it can try to reclaim it
+ * if the post is untrashed.
+ *
+ * For internal use.
+ *
+ * @since 4.5.0
+ *
+ * @param string $post_name    Slug.
+ * @param string $post__not_in Post ID that should be ignored.
+ */
+function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
+    $trashed_posts_with_desired_slug = get_posts( array(
+        'name' => $post_name,
+        'post_status' => 'trash',
+        'post_type' => 'any',
+        'nopaging' => true,
+        'post__not_in' => array( $post_ID )
+    ) );
+
+    if ( ! empty( $trashed_posts_with_desired_slug ) ) {
+        foreach ( $trashed_posts_with_desired_slug as $_post ) {
+            wp_add_trashed_suffix_to_post_name_for_post( $_post );
+        }
+    }
+}
+
+/**
+ * For a given post, add a trashed suffix.
+ *
+ * Store its desired (i.e. current) slug so it can try to reclaim it
+ * if the post is untrashed.
+ *
+ * For internal use.
+ *
+ * @since 4.5.0
+ *
+ * @param WP_Post $post The post.
+ */
+function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
+    global $wpdb;
+
+    $post = get_post( $post );
+
+    if ( strpos( $post->post_name, '-%trashed%' ) ) {
+        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%';
+    $wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
+    clean_post_cache( $post->ID );
+    return $post_name;
+}