Ticket #39603: filling-gaps-slug-generation.diff

C:\Users\User\Documents\wordpress\develop.svn.wordpress.org\src\wp-includes\

@@ -3650 +3650 @@
 }
 
 /**
+ * @param       string  Slug name without suffix
+ * @param       array   Naturally sorted array
+ */
+function _get_first_available_slug($base_slug, $arr) {
+        $base_slug = _truncate_post_slug($base_slug);
+
+        $suffix = 2; // if this function was called, then the base name has been taken
+                                 // (that is $base_slug is the first item of the array)
+        
+        for ($i = 1; $i < count($arr); $i++) {
+                $suffix = $i + 1;
+                
+                $actual_suffix = substr($arr[$i], strlen($base_slug) + 1);
+        
+                if ($suffix != $actual_suffix)
+                        break;
+                elseif ($i == count($arr) - 1)
+                        $suffix++;
+        }
+        
+        return _truncate_post_slug( $base_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-{$suffix}";
+}
+
+/**
+ * Gets a unique post slug using a supplied SQL query for getting the latest appropriate slug.
+ *
+ * @global wpdb  $wpdb                  WordPress database abstraction object.
+ * 
+ * @param string $slug                  The desired slug (post_name).
+ * @param string $similar_slugs_sql     An SQL query returning the latest appropriate slug.
+ * @param array  $prep_args             Parameters for the SQL query for using in $wpdb->prepare() call.
+ */
+function _get_unique_post_slug( $slug, $similar_slugs_sql, $prep_args ) {
+        global $wpdb;
+        
+        $similar_slugs_prep = $wpdb->prepare($similar_slugs_sql, $prep_args);
+        $slugs = $wpdb->get_col($similar_slugs_prep);
+        $slug = _get_first_available_slug($slug, $slugs);
+        
+        return $slug;
+}
+
+/**
  * Computes a unique slug for the post, when given the desired slug and some post details.
  *
  * @since 2.8.0
@@ -3690 +3733 @@
                  * @param string $slug     The post slug.
                  */
                 if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
-                        $suffix = 2;
-                        do {
-                                $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
-                                $suffix++;
-                        } while ( $post_name_check );
-                        $slug = $alt_post_name;
+                        $similar_slugs_sql = "SELECT post_name FROM $wpdb->posts WHERE (post_name = %s OR post_name RLIKE %s) AND ID != %d ORDER BY LENGTH(post_name), post_name";
+                        $slug = _get_unique_post_slug($slug, $similar_slugs_sql, array($slug, $wpdb->esc_like("^{$slug}-[0-9]+\$"), $post_ID));
                 }
         } elseif ( is_post_type_hierarchical( $post_type ) ) {
                 if ( 'nav_menu_item' == $post_type )
                         return $slug;
-
                 /*
                  * 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 ( %s, 'attachment' ) 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 ) );
-
+                
                 /**
                  * Filters whether the post slug would make a bad hierarchical post slug.
                  *
@@ -3720 +3757 @@
                  * @param int    $post_parent Post parent ID.
                  */
                 if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || 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 = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
-                                $suffix++;
-                        } while ( $post_name_check );
-                        $slug = $alt_post_name;
+                        $similar_slugs_sql = "SELECT post_name FROM $wpdb->posts WHERE (post_name = %s OR post_name RLIKE %s) AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d ORDER BY LENGTH(post_name), post_name";
+                        $slug = _get_unique_post_slug($slug, $similar_slugs_sql, array($slug, $wpdb->esc_like("^{$slug}-[0-9]+\$"), $post_type, $post_ID, $post_parent));
                 }
         } else {
                 // Post slugs must be unique across all posts.
@@ -3765 +3797 @@
                  * @param string $post_type Post type.
                  */
                 if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
-                        $suffix = 2;
-                        do {
-                                $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-                                $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;
+                        $similar_slugs_sql = "SELECT post_name FROM $wpdb->posts WHERE (post_name = %s OR post_name RLIKE %s) AND post_type = %s AND ID != %d ORDER BY LENGTH(post_name), post_name";
+                        $slug = _get_unique_post_slug($slug, $similar_slugs_sql, array($slug, $wpdb->esc_like("^{$slug}-[0-9]+\$"), $post_type, $post_ID));
                 }
         }