Changeset 30629

Timestamp:

11/30/2014 04:48:54 AM (9 years ago)

Author:

johnbillion

Message:

Check attachments as well as the current post type when checking for duplicate post slugs. This avoids creating a page with a slug which conflicts with an existing attachment (the inverse is already handled).

Updates the existing test for pages which should take priority over attachments in cases where an existing clash exists.

Fixes #18962
Props boonebgorges

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -3704 +3704 @@
          * 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 = %s 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 ) );
 

trunk/tests/phpunit/tests/post.php

@@ -505 +505 @@
      */
     function test_get_page_by_path_priority() {
+        global $wpdb;
+
         $attachment = $this->factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'attachment' ) );
         $page       = $this->factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'page' ) );
         $other_att  = $this->factory->post->create_and_get( array( 'post_title' => 'some-other-page', 'post_type' => 'attachment' ) );
+
+        $wpdb->update( $wpdb->posts, array( 'post_name' => 'some-page' ), array( 'ID' => $page->ID ) );
+        clean_post_cache( $page->ID );
+
+        $page = get_post( $page->ID );
 
         $this->assertEquals( 'some-page', $attachment->post_name );
@@ -989 +996 @@
 
     /**
+     * @ticket 18962
+     */
+    function test_wp_unique_post_slug_with_hierarchy_and_attachments() {
+        register_post_type( 'post-type-1', array( 'hierarchical' => true ) );
+
+        $args = array(
+            'post_type' => 'post-type-1',
+            'post_name' => 'some-slug',
+            'post_status' => 'publish',
+        );
+        $one = $this->factory->post->create( $args );
+
+        $args = array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type' => 'attachment',
+            'post_name' => 'image'
+        );
+        $attachment = $this->factory->attachment->create_object( 'image.jpg', $one, $args );
+
+        $args = array(
+            'post_type' => 'post-type-1',
+            'post_name' => 'image',
+            'post_status' => 'publish',
+            'post_parent' => $one
+        );
+        $two = $this->factory->post->create( $args );
+
+        $this->assertEquals( 'some-slug', get_post( $one )->post_name );
+        $this->assertEquals( 'image', get_post( $attachment )->post_name );
+        $this->assertEquals( 'image-2', get_post( $two )->post_name );
+
+        // 'image' can be a child of image-2
+        $this->assertEquals( 'image', wp_unique_post_slug( 'image', 0, 'publish', 'post-type-1', $two ) );
+
+        _unregister_post_type( 'post-type-1' );
+    }
+
+    /**
      * @ticket 21212
      */