Changeset 4199

Timestamp:

09/21/2006 12:01:20 AM (19 years ago)

Author:

ryan

Message:

Don't allow pages to have the same names as feeds to avoid rewrite collision. Props skeltoac. fixes #1231

File:

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

trunk/wp-includes/post.php

@@ -592 +592 @@
         $post_name_check = $wpdb->get_var("SELECT post_name FROM $wpdb->posts WHERE post_name = '$post_name' AND post_type = '$post_type' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
 
-        if ($post_name_check) {
+        if ($post_name_check || in_array($post_name, $wp_rewrite->feeds) ) {
             $suffix = 2;
-            while ($post_name_check) {
+            do {
                 $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_type = '$post_type' AND ID != '$post_ID' AND post_parent = '$post_parent' LIMIT 1");
                 $suffix++;
-            }
+            } while ($post_name_check);
             $post_name = $alt_post_name;
         }