Ticket #20419: 20419-post-obj.patch

wp-includes/post.php

@@ -2826 +2826 @@
  * @global wpdb $wpdb
  * @global WP_Rewrite $wp_rewrite
  * @param string $slug the desired slug (post_name)
- * @param integer $post_ID
- * @param string $post_status no uniqueness checks are made if the post is still draft or pending
+ * @param integer|obj $post Either a post ID or post object.  Uniqueness
+ *     checks are only made if post status is "publish"
+ * @param string $deprecated
  * @param string $post_type
  * @param integer $post_parent
  * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
-function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-        if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
+function wp_unique_post_slug( $slug, $post, $deprecated, $post_type, $post_parent ) {
+        if ( $deprecated )
+                _deprecated_argument( __FUNCTION__, '3.5' );
+
+        if ( isset($post->post_status) ) {
+                $post_status = $post->post_status;
+        } else {
+                // Convert expected $post object to $post->ID for backwards compatability
+                $post = array( 'ID' => $post );
+                $post = (object) $post;
+        }
+
+        if ( 'publish' === ( $deprecated || $post->post_status ) )
                 return $slug;
 
         global $wpdb, $wp_rewrite;
@@ -2848 +2860 @@
         if ( 'attachment' == $post_type ) {
                 // Attachment slugs must be unique across all types.
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
-                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
+                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post->ID ) );
 
                 if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
                         $suffix = 2;
                         do {
                                 $alt_post_name = substr ($slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare($check_sql, $alt_post_name, $post_ID ) );
+                                $post_name_check = $wpdb->get_var( $wpdb->prepare($check_sql, $alt_post_name, $post->ID ) );
                                 $suffix++;
                         } while ( $post_name_check );
                         $slug = $alt_post_name;
@@ -2863 +2875 @@
                 // Page slugs must be unique within their own trees. Pages are in a separate
                 // namespace than posts so page slugs are allowed to overlap post slugs.
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode( "', '", esc_sql( $hierarchical_post_types ) ) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
-                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) );
+                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post->ID, $post_parent ) );
 
                 if ( $post_name_check || in_array( $slug, $feeds ) || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
                         $suffix = 2;
                         do {
                                 $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) );
+                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post->ID, $post_parent ) );
                                 $suffix++;
                         } while ( $post_name_check );
                         $slug = $alt_post_name;
@@ -2877 +2889 @@
         } else {
                 // Post slugs must be unique across all posts.
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
-                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
+                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post->ID ) );
 
                 if ( $post_name_check || in_array( $slug, $feeds ) || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
                         $suffix = 2;
                         do {
                                 $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post->ID ) );
                                 $suffix++;
                         } while ( $post_name_check );
                         $slug = $alt_post_name;
                 }
         }
 
-        return apply_filters( 'wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug );
+        return apply_filters( 'wp_unique_post_slug', $slug, $post->ID, $post->post_status, $post_type, $post_parent, $original_slug );
 }
 
 /**

wp-admin/includes/post.php

@@ -1034 +1034 @@
         if ( !is_null($name) )
                 $post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 
-        $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
+        $post->post_name = wp_unique_post_slug( $post->post_name, $post->post_status, $deprecated, $post->post_type, $post->post_parent, $post );
 
         $post->filter = 'sample';