Changeset 39506

Timestamp:

12/05/2016 07:32:09 PM (8 years ago)

Author:

westonruter

Message:

Customize: Defer populating post_name for auto-draft posts in customized state until posts are published.

The ultimate post_name is stored in postmeta until the post is published. The get_page_by_path() function does not exclude auto-draft posts. Revert changes to wp_unique_post_slug() from [39411] which excluded auto-draft posts.

Props westonruter, dlh for testing, helen for testing.
See #38114, #38928.
Fixes #39078.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• src/wp-includes/class-wp-customize-nav-menus.php (modified) (2 diffs)
• src/wp-includes/post.php (modified) (3 diffs)
• tests/phpunit/tests/ajax/CustomizeMenus.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (4 diffs)
• tests/phpunit/tests/customize/nav-menus.php (modified) (5 diffs)
• tests/phpunit/tests/post/wpUniquePostSlug.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -1007 +1007 @@
             ) );
             foreach ( $existing_posts_query->posts as $existing_post ) {
-                $existing_starter_content_posts[ $existing_post->post_type . ':' . $existing_post->post_name ] = $existing_post;
+                $post_name = $existing_post->post_name;
+                if ( empty( $post_name ) ) {
+                    $post_name = get_post_meta( $existing_post->ID, '_customize_draft_post_name', true );
+                }
+                $existing_starter_content_posts[ $existing_post->post_type . ':' . $post_name ] = $existing_post;
             }
         }
@@ -1068 +1072 @@
 
                     $attachment_post_data = array_merge(
-                        wp_array_slice_assoc( $attachment, array( 'post_title', 'post_content', 'post_excerpt', 'post_name' ) ),
+                        wp_array_slice_assoc( $attachment, array( 'post_title', 'post_content', 'post_excerpt' ) ),
                         array(
                             'post_status' => 'auto-draft', // So attachment will be garbage collected in a week if changeset is never published.
@@ -1086 +1090 @@
                     }
                     update_post_meta( $attachment_id, '_starter_content_theme', $this->get_stylesheet() );
+                    update_post_meta( $attachment_id, '_customize_draft_post_name', $attachment['post_name'] );
                 }
 

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -804 +804 @@
             $postarr['post_name'] = sanitize_title( $postarr['post_title'] );
         }
+        if ( ! isset( $postarr['meta_input'] ) ) {
+            $postarr['meta_input'] = array();
+        }
+        $postarr['meta_input']['_customize_draft_post_name'] = $postarr['post_name'];
+        unset( $postarr['post_name'] );
 
         add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
@@ -1193 +1198 @@
             foreach ( $post_ids as $post_id ) {
                 $target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish';
+                $args = array(
+                    'ID' => $post_id,
+                    'post_status' => $target_status,
+                );
+                $post_name = get_post_meta( $post_id, '_customize_draft_post_name', true );
+                if ( $post_name ) {
+                    $args['post_name'] = $post_name;
+                }
 
                 // Note that wp_publish_post() cannot be used because unique slugs need to be assigned.
-                wp_update_post( array( 'ID' => $post_id, 'post_status' => $target_status ) );
+                wp_update_post( wp_slash( $args ) );
+
+                delete_post_meta( $post_id, '_customize_draft_post_name' );
             }
         }

trunk/src/wp-includes/post.php

@@ -3679 +3679 @@
     if ( 'attachment' == $post_type ) {
         // Attachment slugs must be unique across all types.
-        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_status != 'auto-draft' AND post_name = %s AND ID != %d LIMIT 1";
+        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
         $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
 
@@ -3707 +3707 @@
          * namespace than posts so page slugs are allowed to overlap post slugs.
          */
-        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_status != 'auto-draft' AND post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
+        $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 ) );
 
@@ -3731 +3731 @@
     } else {
         // Post slugs must be unique across all posts.
-        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_status != 'auto-draft' AND post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
+        $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 ) );
 

trunk/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -602 +602 @@
         $this->assertEquals( 'Hello World', $post->post_title );
         $this->assertEquals( 'post', $post->post_type );
-        $this->assertEquals( 'hello-world', $post->post_name );
+        $this->assertEquals( '', $post->post_name );
+        $this->assertEquals( 'hello-world', get_post_meta( $post->ID, '_customize_draft_post_name', true ) );
     }
 

trunk/tests/phpunit/tests/customize/manager.php

@@ -454 +454 @@
             } else {
                 $this->assertEquals( 'auto-draft', $post->post_status );
+                $this->assertEmpty( $post->post_name );
             }
-            $posts_by_name[ $post->post_name ] = $post->ID;
+            $post_name = $post->post_name;
+            if ( empty( $post_name ) ) {
+                $post_name = get_post_meta( $post->ID, '_customize_draft_post_name', true );
+            }
+            $posts_by_name[ $post_name ] = $post->ID;
         }
         $this->assertEquals( array( 'waffles', 'canola', 'home', 'about', 'blog', 'custom' ), array_keys( $posts_by_name ) );
@@ -465 +470 @@
         $attachment_metadata = wp_get_attachment_metadata( $posts_by_name['waffles'] );
         $this->assertEquals( 'Waffles', get_post( $posts_by_name['waffles'] )->post_title );
+        $this->assertEquals( 'waffles', get_post_meta( $posts_by_name['waffles'], '_customize_draft_post_name', true ) );
         $this->assertArrayHasKey( 'file', $attachment_metadata );
         $this->assertContains( 'waffles', $attachment_metadata['file'] );
@@ -489 +495 @@
         $wp_customize->import_theme_starter_content();
         $changeset_data = $wp_customize->changeset_data();
-        $this->assertEqualSets( array_values( $posts_by_name ), $changeset_data['nav_menus_created_posts']['value'], 'Auto-drafts should not get re-created and amended with each import.' );
+        $this->assertEqualSets( array_values( $posts_by_name ), $changeset_data['nav_menus_created_posts']['value'] ); // Auto-drafts should not get re-created and amended with each import.
 
         // Test that saving non-starter content on top of the changeset clears the starter_content flag.
@@ -540 +546 @@
         $this->assertContains( 'waffles', get_header_image() );
         $this->assertContains( 'waffles', get_background_image() );
+        $this->assertEquals( 'waffles', get_post( $posts_by_name['waffles'] )->post_name );
+        $this->assertEmpty( get_post_meta( $posts_by_name['waffles'], '_customize_draft_post_name', true ) );
     }
 

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -550 +550 @@
         $this->assertInstanceOf( 'WP_Post', $r );
         $this->assertEquals( 'Hello World', $r->post_title );
-        $this->assertEquals( 'hello-world', $r->post_name );
+        $this->assertEquals( '', $r->post_name );
+        $this->assertEquals( 'hello-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );
         $this->assertEquals( 'post', $r->post_type );
 
@@ -557 +558 @@
         $this->assertEquals( 'Hello World', $r->post_title );
         $this->assertEquals( 'post', $r->post_type );
-        $this->assertEquals( 'greetings-world', $r->post_name );
+        $this->assertEquals( '', $r->post_name );
+        $this->assertEquals( 'greetings-world', get_post_meta( $r->ID, '_customize_draft_post_name', true ) );
         $this->assertEquals( 'Hi World', $r->post_content );
     }
@@ -740 +742 @@
         do_action( 'customize_register', $this->wp_customize );
 
-        $post_ids = $this->factory()->post->create_many( 3, array(
-            'post_status' => 'auto-draft',
-            'post_type' => 'post',
-            'post_name' => 'auto-draft',
-        ) );
+        $post_ids = array();
+        for ( $i = 0; $i < 3; $i += 1 ) {
+            $r = $menus->insert_auto_draft_post( array(
+                'post_title' => 'Auto Draft ' . $i,
+                'post_type' => 'post',
+                'post_name' => 'auto-draft-' . $i,
+            ) );
+            $this->assertInstanceOf( 'WP_Post', $r );
+            $post_ids[] = $r->ID;
+        }
+
         $pre_published_post_id = $this->factory()->post->create( array( 'post_status' => 'publish' ) );
 
@@ -755 +763 @@
         foreach ( $post_ids as $post_id ) {
             $this->assertEquals( 'auto-draft', get_post_status( $post_id ) );
+            $this->assertEmpty( get_post( $post_id )->post_name );
+            $this->assertNotEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );
         }
 
@@ -762 +772 @@
         foreach ( $post_ids as $post_id ) {
             $this->assertEquals( 'publish', get_post_status( $post_id ) );
+            $this->assertRegExp( '/^auto-draft-\d+$/', get_post( $post_id )->post_name );
+            $this->assertEmpty( get_post_meta( $post_id, '_customize_draft_post_name', true ) );
         }
 

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

@@ -348 +348 @@
         $this->assertSame( 'embed-2', $found );
     }
-
-    /**
-     * @ticket 38928
-     */
-    public function test_non_unique_slugs_for_existing_auto_draft_posts() {
-        $auto_draft_post_id = self::factory()->post->create( array(
-            'post_type' => 'post',
-            'post_name' => 'existing-post',
-            'post_status' => 'auto-draft',
-        ) );
-        $auto_draft_page_id = self::factory()->post->create( array(
-            'post_type' => 'page',
-            'post_name' => 'existing-page',
-            'post_status' => 'auto-draft',
-        ) );
-        $auto_draft_attachment_id = self::factory()->attachment->create_object( 'image.jpg', $auto_draft_page_id, array(
-            'post_mime_type' => 'image/jpeg',
-            'post_type' => 'attachment',
-            'post_name' => 'existing-attachment',
-            'post_status' => 'auto-draft',
-        ) );
-
-        $post_id = self::factory()->post->create( array( 'post_type' => 'post' ) );
-        $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
-        $attachment_id = self::factory()->attachment->create_object( 'image2.jpg', $page_id, array(
-            'post_mime_type' => 'image/jpeg',
-            'post_type' => 'attachment',
-            'post_name' => 'existing-image',
-        ) );
-
-        $this->assertEquals( 'existing-post', wp_unique_post_slug( 'existing-post', $post_id, 'publish', get_post_type( $post_id ), 0 ) );
-        wp_publish_post( $auto_draft_post_id );
-        $this->assertEquals( 'existing-post-2', wp_unique_post_slug( 'existing-post', $post_id, 'publish', get_post_type( $post_id ), 0 ) );
-
-        $this->assertEquals( 'existing-page', wp_unique_post_slug( 'existing-page', $page_id, 'publish', get_post_type( $page_id ), 0 ) );
-        wp_publish_post( $auto_draft_page_id );
-        $this->assertEquals( 'existing-page-2', wp_unique_post_slug( 'existing-page', $page_id, 'publish', get_post_type( $page_id ), 0 ) );
-
-        $this->assertEquals( 'existing-attachment', wp_unique_post_slug( 'existing-attachment', $attachment_id, 'publish', get_post_type( $attachment_id ), 0 ) );
-        wp_publish_post( $auto_draft_attachment_id );
-        $this->assertEquals( 'existing-attachment-2', wp_unique_post_slug( 'existing-attachment', $attachment_id, 'publish', get_post_type( $attachment_id ), 0 ) );
-    }
 }