Changes in trunk/wp-includes/post.php [12163:12307]

File:

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

trunk/wp-includes/post.php

@@ -1187 +1187 @@
     delete_post_meta($postid,'_wp_trash_meta_time');
 
-    /** @todo delete for pluggable post taxonomies too */
-    wp_delete_object_term_relationships($postid, array('category', 'post_tag'));
+    wp_delete_object_term_relationships($postid, get_object_taxonomies($post->post_type));
 
     $parent_data = array( 'post_parent' => $post->post_parent );
@@ -1238 +1237 @@
     }
 
-    do_action( 'delete_post', $post_id );
+    do_action( 'delete_post', $postid );
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->posts WHERE ID = %d", $postid ));
-    do_action( 'deleted_post', $post_id );
+    do_action( 'deleted_post', $postid );
 
     if ( 'page' == $post->post_type ) {
@@ -1505 +1504 @@
     // Set the limit clause, if we got a limit
     $num = (int) $num;
-    if ($num) {
+    if ( $num ) {
         $limit = "LIMIT $num";
     }
 
-    $sql = "SELECT * FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC $limit";
-    $result = $wpdb->get_results($sql,ARRAY_A);
+    $sql = "SELECT * FROM $wpdb->posts WHERE post_type = 'post' AND post_status IN ( 'draft', 'publish', 'future', 'pending', 'private' ) ORDER BY post_date DESC $limit";
+    $result = $wpdb->get_results($sql, ARRAY_A);
 
     return $result ? $result : array();
@@ -1611 +1610 @@
     }
 
-    if ( ('' == $post_content) && ('' == $post_title) && ('' == $post_excerpt) ) {
+    if ( ('' == $post_content) && ('' == $post_title) && ('' == $post_excerpt) && ('attachment' != $post_type) ) {
         if ( $wp_error )
             return new WP_Error('empty_content', __('Content, title, and excerpt are empty.'));
@@ -1942 +1941 @@
  * Given the desired slug and some post details computes a unique slug for the post.
  *
+ * @global wpdb $wpdb 
+ * @global WP_Rewrite $wp_rewrite 
  * @param string $slug the desired slug (post_name)
  * @param integer $post_ID
@@ -1954 +1955 @@
 
     global $wpdb, $wp_rewrite;
+
+    $feeds = $wp_rewrite->feeds;
+    if ( !is_array($feeds) )
+        $feeds = array();
+
     $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
     if ( 'attachment' == $post_type ) {
@@ -1960 +1966 @@
         $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
 
-        if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
+        if ( $post_name_check || in_array($slug, $feeds) ) {
             $suffix = 2;
             do {
@@ -1975 +1981 @@
         $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
 
-        if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
+        if ( $post_name_check || in_array($slug, $feeds) ) {
             $suffix = 2;
             do {
@@ -2600 +2606 @@
             $excludes[] = $child->ID;
         $excludes[] = $exclude;
+        $num_pages = count($pages);
         for ( $i = 0; $i < $num_pages; $i++ ) {
             if ( in_array($pages[$i]->ID, $excludes) )
@@ -2797 +2804 @@
     clean_post_cache($post_ID);
 
+    if ( isset($post_parent) && $post_parent < 0 )
+        add_post_meta($post_ID, '_wp_attachment_temp_parent', $post_parent, true);
+
     if ( $update) {
         do_action('edit_attachment', $post_ID);
@@ -2842 +2852 @@
     do_action('delete_attachment', $post_id);
 
-    /** @todo Delete for pluggable post taxonomies too */
     wp_delete_object_term_relationships($post_id, array('category', 'post_tag'));
+    wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type));
 
     $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key = '_thumbnail_id' AND meta_value = %d", $post_id ));
@@ -3696 +3706 @@
 function wp_save_post_revision( $post_id ) {
     // We do autosaves manually with wp_create_post_autosave()
-    if ( @constant( 'DOING_AUTOSAVE' ) )
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
         return;