Changes from branches/3.5/wp-includes/post.php at r23213 to trunk/wp-includes/post.php at r22989

File:

• trunk/wp-includes/post.php (modified) (3 diffs)

trunk/wp-includes/post.php

@@ -683 +683 @@
 function get_post_ancestors( $post ) {
     if ( ! $post )
-        return array();
+        return false;
 
     $post = get_post( $post );
@@ -3011 +3011 @@
  *
  * @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 mixed $post Post ID or object.
  */
 function wp_publish_post( $post ) {
-    global $wpdb;
-
     if ( ! $post = get_post( $post ) )
         return;
-
     if ( 'publish' == $post->post_status )
         return;
 
-    $wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
-
-    clean_post_cache( $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( $post );
 }
 
@@ -3595 +3582 @@
  */
 function get_page_uri($page) {
-    $page = get_post( $page );
-
+    if ( ! is_object($page) )
+        $page = get_post( $page );
     $uri = $page->post_name;