Ticket #13459: 13459-w-test.diff

tests/phpunit/tests/post.php

@@ -1068 +1068 @@
                         $this->assertEquals( $post->$field, $value );
                 }
         }
+
+        function test_unique_slug_page_then_post() {
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure( '/%postname%/' );
+                $page_args = array(
+                        'post_type' => 'page',
+                        'post_name' => 'green',
+                        'post_status' => 'publish',
+                );
+                $page = $this->factory->post->create( $page_args );
+                $this->assertEquals( 'green', get_post( $page )->post_name );
+                
+                $post_args = array(
+                        'post_type' => 'post',
+                        'post_name' => 'green',
+                        'post_status' => 'publish',
+                );
+                $post = $this->factory->post->create( $post_args );
+                
+                $this->assertEquals( 'green-2', get_post( $post )->post_name );
+                $wp_rewrite->flush_rules();
+        }
+
+        function test_unique_slug_post_then_page() {
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure( '/%postname%/' );
+                $post_args = array(
+                        'post_type' => 'post',
+                        'post_name' => 'red'
+                );
+                $post = $this->factory->post->create( $post_args );
+                $this->assertEquals( 'red', get_post( $post )->post_name );
+
+                $page_args = array(
+                        'post_type' => 'page',
+                        'post_name' => 'red'
+                );
+                $page = $this->factory->post->create( $page_args );
+                $this->assertEquals( 'red-2', get_post( $page )->post_name );
+                $wp_rewrite->flush_rules();
+        }
+
+        function test_unique_slug_post_then_post() {
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure( '/%postname%/' );
+                $post_args = array(
+                        'post_type' => 'post',
+                        'post_name' => 'blue'
+                );
+                $post = $this->factory->post->create( $post_args );
+                $this->assertEquals( 'blue', get_post( $post )->post_name );
+
+                $post_args = array(
+                        'post_type' => 'post',
+                        'post_name' => 'blue'
+                );
+                $post = $this->factory->post->create( $post_args );
+                $this->assertEquals( 'blue-2', get_post( $post )->post_name );
+                $wp_rewrite->flush_rules();
+        }
+
+        function test_unique_slug_page_then_page() {
+                global $wp_rewrite;
+                $wp_rewrite->set_permalink_structure( '/%postname%/' );
+                $page_args = array(
+                        'post_type' => 'page',
+                        'post_name' => 'orange'
+                );
+                $page = $this->factory->post->create( $page_args );
+                $this->assertEquals( 'orange', get_post( $page )->post_name );
+
+                $page_args = array(
+                        'post_type' => 'page',
+                        'post_name' => 'orange'
+                );
+                $page = $this->factory->post->create( $page_args );
+                $this->assertEquals( 'orange-2', get_post( $page )->post_name );
+                $wp_rewrite->flush_rules();
+        }
 }

src/wp-includes/post.php

@@ -3678 +3678 @@
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
 function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-        if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
+        if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) ) {
                 return $slug;
+        }
 
         global $wpdb, $wp_rewrite;
 
         $original_slug = $slug;
 
         $feeds = $wp_rewrite->feeds;
-        if ( ! is_array( $feeds ) )
+        if ( ! is_array( $feeds ) ) {
                 $feeds = array();
+        }
 
         if ( 'attachment' == $post_type ) {
                 // Attachment slugs must be unique across all types.
@@ -3712 +3714 @@
                         $slug = $alt_post_name;
                 }
         } elseif ( is_post_type_hierarchical( $post_type ) ) {
-                if ( 'nav_menu_item' == $post_type )
+                if ( 'nav_menu_item' == $post_type ) {
                         return $slug;
+                }
 
-                /*
-                 * Page slugs must be unique within their own trees. Pages are in a separate
-                 * namespace than posts so page slugs are allowed to overlap post slugs.
-                 */
-                $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
-                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+                if( '/%postname%/' == $wp_rewrite->permalink_structure && $post_parent === 0 ) {
+                        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d AND post_parent = %d LIMIT 1";
+                        $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) );
+                } else {
+                        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
+                        $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+                }
 
                 /**
                  * Filter whether the post slug would make a bad hierarchical post slug.
@@ -3746 +3750 @@
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
+                if ( ! $post_name_check && '/%postname%/' == $wp_rewrite->permalink_structure ) {
+                        $post_name_check = get_page_by_path( $slug );
+                }
+
                 /**
                  * Filter whether the post slug would be bad as a flat slug.
                  *
@@ -3760 +3768 @@
                         do {
                                 $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
                                 $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+                                
+                                if ( ! $post_name_check && '/%postname%/' == $wp_rewrite->permalink_structure ) { 
+                                        $post_name_check = get_page_by_path( $alt_post_name );
+                                }
+
                                 $suffix++;
                         } while ( $post_name_check );
                         $slug = $alt_post_name;