Ticket #9726: 9726.diff

wp-includes/post.php

@@ -1717 +1717 @@
                         $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d AND post_parent = %d LIMIT 1";
                         $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID, $post_parent));
                 }
-
+                
                 if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
                         $suffix = 2;
                         do {
@@ -2415 +2415 @@
         else
                 $post_name = sanitize_title($post_name);
 
-        // expected_slashed ($post_name)
-        $post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_status = 'inherit' AND ID != %d LIMIT 1", $post_name, $post_ID));
+        $post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
-        if ($post_name_check) {
-                $suffix = 2;
-                while ($post_name_check) {
-                        $alt_post_name = $post_name . "-$suffix";
-                        // expected_slashed ($alt_post_name, $post_name)
-                        $post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_status = 'inherit' AND ID != %d LIMIT 1", $alt_post_name, $post_ID, $post_parent));
-                        $suffix++;
-                }
-                $post_name = $alt_post_name;
-        }
-
         if ( empty($post_date) )
                 $post_date = current_time('mysql');
         if ( empty($post_date_gmt) )