Ticket #11399: 11399.sw.2.diff

wp-includes/default-filters.php

@@ -249 +249 @@
 add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
 add_action( 'pre_post_update',            'wp_save_post_revision'                          );
 add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
-add_action( 'save_post',                  '_save_post_hook',                          5, 2 );
 add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
 add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
 add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );

wp-includes/post.php

@@ -2100 +2100 @@
 
         clean_post_cache( $post );
 
-        if ( is_post_type_hierarchical( $post->post_type ) ) {
-                foreach ( (array) $children as $child )
-                        clean_post_cache( $child );
-        }
-
         wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
 
         do_action('after_delete_post', $postid);
@@ -2772 +2767 @@
  * Publish a post by transitioning the post status.
  *
  * @since 2.1.0
- * @uses $wpdb
- * @uses do_action() Calls 'edit_post', 'save_post', and 'wp_insert_post' on post_id and post data.
+ * @uses wp_update_post()
  *
- * @param int $post_id Post ID.
+ * @param int|object $post Post ID or Post object.
  * @return null
  */
-function wp_publish_post($post_id) {
-        global $wpdb;
-
-        $post = get_post($post_id);
-
-        if ( empty($post) )
-                return;
-
-        if ( 'publish' == $post->post_status )
+function wp_publish_post($post) {
+        $post = get_post( $post );
+        if ( empty( $post ) )
                 return;
-
-        $wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post_id ) );
-
-        $old_status = $post->post_status;
-        $post->post_status = 'publish';
-        wp_transition_post_status('publish', $old_status, $post);
-
-        do_action('edit_post', $post_id, $post);
-        do_action('save_post', $post_id, $post);
-        do_action('wp_insert_post', $post_id, $post);
+        wp_update_post( array( 'ID' => $post->ID, 'post_status' => 'publish' ) );
 }
 
 /**
@@ -4408 +4387 @@
                 do_action( 'clean_page_cache', $post->ID );
         }
 
-        if ( $children = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_type FROM $wpdb->posts WHERE post_parent = %d", $post->ID) ) ) {
+        if ( $children = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_type FROM $wpdb->posts WHERE post_parent = %d AND post_type <> 'revision' ", $post->ID) ) ) {
                 foreach ( $children as $child ) {
                         // Loop detection
                         if ( $child->ID == $post->ID )
@@ -4615 +4594 @@
 }
 
 /**
- * Hook used to prevent page/post cache from staying dirty when a post is saved.
- *
- * @since 2.3.0
- * @access private
- *
- * @param int $post_id The ID in the database table for the $post
- * @param object $post Object type containing the post information
- */
-function _save_post_hook( $post_id, $post ) {
-        clean_post_cache( $post );
-}
-
-/**
  * Retrieve post ancestors and append to post ancestors property.
  *
  * Will only retrieve ancestors once, if property is already set, then nothing