Ticket #6265: wordpress-importer-new.patch

wp-admin/import/wordpress.php

@@ -338 +338 @@
                 $post_ID = (int) $this->get_tag( $post, 'wp:post_id' );
                 if ( $post_ID && !empty($this->post_ids_processed[$post_ID]) ) // Processed already
                         return 0;
-                
+
                 set_time_limit( 60 );
 
                 // There are only ever one of these
@@ -379 +379 @@
                         $cat_index++;
                 }
 
-                $post_exists = post_exists($post_title, '', $post_date);
+                $post_exists = post_exists($post_title, '', $post_date, $post_name);
 
                 if ( $post_exists ) {
                         echo '<li>';

wp-admin/includes/post.php

@@ -190 +190 @@
         return $post;
 }
 
-function post_exists($title, $content = '', $post_date = '') {
+function post_exists($title, $content = '', $post_date = '', $post_name = '') {
         global $wpdb;
 
         if (!empty ($post_date))
                 $post_date = "AND post_date = '$post_date'";
 
-        if (!empty ($title))
-                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
+        if(!empty($post_name))
+                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_name = '$post_name' $post_date");
         else
-                if (!empty ($content))
-                        return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
+                if (!empty ($title))
+                        return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_title = '$title' $post_date");
+                else
+                        if (!empty ($content))
+                                return $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE post_content = '$content' $post_date");
 
         return 0;
 }
@@ -609 +612 @@
         if (in_array($post->post_status, array('draft', 'pending'))) {
                 $post->post_status = 'publish';
                 $post->post_date = date('Y-m-d H:i:s');
-                $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); 
+                $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID);
         }
 
         // If the user wants to set a new name -- override the current one