Changeset 11071 for trunk/wp-includes/post.php

Timestamp:

04/23/2009 08:21:18 PM (17 years ago)

Author:

ryan

Message:

Add wp_unique_post_slug(). Apply it when getting sample permalinks. Props nbachiyski. fixes #6595

File:

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

trunk/wp-includes/post.php

@@ -1411 +1411 @@
         // Create a valid post name.  Drafts and pending posts are allowed to have an empty
         // post name.
-        if ( empty($post_name) ) {
+        if ( !isset($post_name) || empty($post_name) ) {
                 if ( !in_array( $post_status, array( 'draft', 'pending' ) ) )
                         $post_name = sanitize_title($post_title);
+                else
+                        $post_name = '';
         } else {
                 $post_name = sanitize_title($post_name);
@@ -1485 +1487 @@
                 $post_password = '';
 
-        if ( !in_array( $post_status, array( 'draft', 'pending' ) ) ) {
-                $post_name_check = $wpdb->get_var($wpdb->prepare("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, $post_type, $post_ID, $post_parent));
-
-                if ($post_name_check || in_array($post_name, $wp_rewrite->feeds) ) {
-                        $suffix = 2;
-                        do {
-                                $alt_post_name = substr($post_name, 0, 200-(strlen($suffix)+1)). "-$suffix";
-                                $post_name_check = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d AND post_parent = %d LIMIT 1", $alt_post_name, $post_type, $post_ID, $post_parent));
-                                $suffix++;
-                        } while ($post_name_check);
-                        $post_name = $alt_post_name;
-                }
-        }
+        $post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
         // expected_slashed (everything!)
@@ -1704 +1694 @@
 
         return wp_publish_post($post_id);
+}
+
+
+/**
+ * Given the desired slug and some post details computes a unique slug for the post.
+ *
+ * @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 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) {
+        global $wpdb, $wp_rewrite;
+        if ( !in_array( $post_status, array( 'draft', 'pending' ) ) ) {
+                $post_name_check = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d AND post_parent = %d LIMIT 1", $slug, $post_type, $post_ID, $post_parent));
+
+                if ($post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
+                        $suffix = 2;
+                        do {
+                                $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix";
+                                $post_name_check = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d AND post_parent = %d LIMIT 1", $alt_post_name, $post_type, $post_ID, $post_parent));
+                                $suffix++;
+                        } while ($post_name_check);
+                        $slug = $alt_post_name;
+                }
+        }
+        return $slug;
 }