Ticket #19373: wp-19373-20130728-refresh.diff

wp-includes/post.php

@@ -2616 +2616 @@
  *
  * @param array $postarr Elements that make up post to insert.
  * @param bool $wp_error Optional. Allow return of WP_Error on failure.
+ * @param bool $sanitize Optional. Run "current user" sanitization routines on $postarr.
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
-function wp_insert_post($postarr, $wp_error = false) {
+function wp_insert_post($postarr, $wp_error = false, $sanitize = true) {
         global $wpdb, $user_ID;
 
         $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_ID,
@@ -2627 +2628 @@
                 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0,
                 'post_content' => '', 'post_title' => '');
 
-        $postarr = wp_parse_args($postarr, $defaults);
+        $postarr = wp_parse_args( $postarr, $defaults );
 
         unset( $postarr[ 'filter' ] );
 
-        $postarr = sanitize_post($postarr, 'db');
+        if ( $sanitize ) {
+                $postarr = sanitize_post( $postarr, 'db' );
+        }
 
         // export array as variables
         extract($postarr, EXTR_SKIP);
@@ -2685 +2688 @@
                         $post_category = array();
         }
 
-        if ( empty($post_author) )
-                $post_author = $user_ID;
+        // if no post author is set, try to use current logged in user or return error
+        if ( empty( $post_author ) ) {
+                if ( !empty( $user_ID ) ) {
+                        $post_author = $user_ID;
+                }
+                else {
+                        if ( $wp_error )
+                                return new WP_Error( 'empty_author', __( 'Post author field was not set and there is no current user context to pull the user ID from.' ) );
+                        else
+                                return 0;
+                }
+        }
 
         // Don't allow contributors to set the post slug for pending review posts
-        if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) )
+        if ( 'pending' == $post_status && $sanitize && !current_user_can( 'publish_posts' ) )
                 $post_name = '';
 
         // Create a valid post name. Drafts and pending posts are allowed to have an empty
@@ -2705 +2718 @@
                 if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $ID ) == $check_name )
                         $post_name = $check_name;
                 else // new post, or slug has changed.
-                        $post_name = sanitize_title($post_name);
+                        $post_name = sanitize_title( $post_name );
         }
 
         // If the post date is empty (due to having been new or a draft) and status is not 'draft' or 'pending', set date to now
@@ -2834 +2847 @@
         // new-style support for all custom taxonomies
         if ( !empty($tax_input) ) {
                 foreach ( $tax_input as $taxonomy => $tags ) {
-                        $taxonomy_obj = get_taxonomy($taxonomy);
+                        $taxonomy_obj = get_taxonomy( $taxonomy );
                         if ( is_array($tags) ) // array = hierarchical, string = non-hierarchical.
                                 $tags = array_filter($tags);
-                        if ( current_user_can($taxonomy_obj->cap->assign_terms) )
+                        if ( !$sanitize || current_user_can($taxonomy_obj->cap->assign_terms) )
                                 wp_set_post_terms( $post_ID, $tags, $taxonomy );
                 }
         }