Changeset 33262

Timestamp:

07/14/2015 12:27:11 PM (10 years ago)

Author:

boonebgorges

Message:

In wp_unique_post_slug(), only prevent date archive conflicts when the slug is being changed.

This prevents existing posts with numeric slugs from having their permalinks
changed on update.

Fixes #5305.

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -3817 +3817 @@
         $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
-        // Prevent post slugs that could result in URLs that conflict with date archives.
+        // Prevent new post slugs that could result in URLs that conflict with date archives.
+        $post = get_post( $post_ID );
         $conflicts_with_date_archive = false;
-        if ( 'post' === $post_type && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
+        if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
             $permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
             $postname_index = array_search( '%postname%', $permastructs );

trunk/tests/phpunit/tests/post/wpUniquePostSlug.php

@@ -190 +190 @@
      * @ticket 5305
      */
+    public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_not_be_suffixed_for_already_published_posts() {
+        global $wp_rewrite;
+        $wp_rewrite->init();
+        $wp_rewrite->set_permalink_structure( '/%postname%/' );
+        $wp_rewrite->flush_rules();
+
+        $p = $this->factory->post->create( array(
+            'post_type' => 'post',
+            'post_name' => 'foo',
+            'post_status' => 'publish',
+        ) );
+
+        $found = wp_unique_post_slug( '2015', $p, 'publish', 'post', 0 );
+        $this->assertEquals( '2015-2', $found );
+
+        $wp_rewrite->set_permalink_structure( '' );
+        flush_rewrite_rules();
+    }
+
+    /**
+     * @ticket 5305
+     */
     public function test_yearlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_year_archives() {
         global $wp_rewrite;