Changeset 3277

Timestamp:

12/07/2005 07:02:05 PM (20 years ago)

Author:

ryan

Message:

Make page slugs unique. Props skeltoac. fixes #2034

File:

• trunk/wp-includes/functions-post.php (modified) (1 diff)

trunk/wp-includes/functions-post.php

@@ -99 +99 @@
         $post_password = '';
 
-    if ('publish' == $post_status) {
-        $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1");
+    if ( ('publish' == $post_status) || ('static' == $post_status) ) {
+        $post_name_check = ('publish' == $post_status)
+            ? $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1")
+            : $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_status = 'static' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
+
         if ($post_name_check) {
             $suffix = 2;
             while ($post_name_check) {
                 $alt_post_name = $post_name . "-$suffix";
-                $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1");
+                $post_name_check = ('publish' == $post_status)
+                    ? $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'publish' AND ID != '$post_ID' LIMIT 1")
+                    : $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$alt_post_name' AND post_status = 'static' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
                 $suffix++;
             }