Changeset 11125

Timestamp:

04/29/2009 07:04:27 PM (15 years ago)

Author:

ryan

Message:

Make post slugs unique across all hierarhical post types. Props Denis-de-Bernardy. fixes #6437

File:

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

trunk/wp-includes/post.php

@@ -1710 +1710 @@
     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) ) {
+        $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page', 'attachment'));
+        if ( in_array($post_type, $hierarchical_post_types) ) {
+            $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", $wpdb->escape($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));
+        } else {
+            $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 {
                 $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));
+                $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID, $post_parent));
                 $suffix++;
             } while ($post_name_check);