Changeset 35817

Timestamp:

12/07/2015 05:46:35 PM (9 years ago)

Author:

joehoyle

Message:

Prevent unnecessary $wpdb->update() when hierarchical post doesn't have children.

Props danielbachhuber.
Fixes #34896.

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

@@ -2406 +2406 @@
         $children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type );
         $children = $wpdb->get_results( $children_query );
-
-        $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+        if ( $children ) {
+            $wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+        }
     }
 

trunk/tests/phpunit/tests/post.php

@@ -1254 +1254 @@
         $this->assertEquals($post['post_date_gmt'], $out->post_date_gmt);
     }
+
+    function test_wp_delete_post_reassign_hierarchical_post_type() {
+        $grandparent_page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
+        $parent_page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $grandparent_page_id ) );
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $parent_page_id ) );
+        $this->assertEquals( $parent_page_id, get_post( $page_id )->post_parent );
+        wp_delete_post( $parent_page_id, true );
+        $this->assertEquals( $grandparent_page_id, get_post( $page_id )->post_parent );
+        wp_delete_post( $grandparent_page_id, true );
+        $this->assertEquals( 0, get_post( $page_id )->post_parent );
+    }
+
 }