Changeset 30480

Timestamp:

11/20/2014 04:45:48 PM (12 years ago)

Author:

johnbillion

Message:

Correct an SQL syntax error introduced in r30158. Adds tests.

Fixes #30339
See #18962
Props julien731

Location:

trunk

Files:

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

trunk/src/wp-includes/post.php

@@ -3721 +3721 @@
                         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_ID, $post_parent ) );
+                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );  
                                 $suffix++;
                         } while ( $post_name_check );

trunk/tests/phpunit/tests/post.php

@@ -1019 +1019 @@
 
         /**
+         * @ticket 30339
+         */
+        function test_wp_unique_post_slug_with_hierarchy() {
+                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['post_name'] = 'some-slug-2';
+                $two = $this->factory->post->create( $args );
+
+                $this->assertEquals( 'some-slug', get_post( $one )->post_name );
+                $this->assertEquals( 'some-slug-2', get_post( $two )->post_name );
+
+                $this->assertEquals( 'some-slug-3', wp_unique_post_slug( 'some-slug', 0, 'publish', 'post-type-1', 0 ) );
+
+                _unregister_post_type( 'post-type-1' );
+        }
+
+        /**
+         * @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
          */