Ticket #13394: wordpress.php.diff

--- wp-admin/import/wordpress.php.orig  Fri May 14 23:31:46 2010
+++ wp-admin/import/wordpress.php       Fri May 14 23:39:18 2010
@@ -534,6 +534,45 @@
                                wp_set_post_categories($post_id, $post_cats);
                        }
 
+                       // Add custom taxonomies.
+                       $taxs= get_object_taxonomies('post'); 
+                       foreach($taxs as $ta) {
+                               if(($ta == 'post_tag') || ($ta == 'category')) continue;
+       
+                               $patt = '|<category domain="'. $ta.'" nicename="[^"]+">(.*?)</category>|is';
+                               preg_match_all("'".$patt."'", $post, $tags2);
+                               $tags2 = $tags2[1];
+                               
+                               $tag_index2 = 0;
+                               foreach ($tags2 as $tag2) {
+                                       $tags2[$tag_index2] = $wpdb->escape( html_entity_decode( str_replace(array( '<![CDATA[', ']]>' ), '', $tag2 ) ) );
+                                       $tag_index2++;
+                               }
+                               
+                               if (count($tags2) > 0) {
+                                       $post_tags = array();
+                                       foreach ($tags2 as $tag) {
+                                               if ( '' == $tag )
+                                                       continue;
+                                               $slug = sanitize_term_field('slug', $tag, 0, $ta, 'db');
+                                               $tag_obj = get_term_by('slug', $slug, $ta);
+                                               $tag_id = 0;
+                                               if ( ! empty($tag_obj) )
+                                                       $tag_id = $tag_obj->term_id;
+                                               if ( $tag_id == 0 ) {
+                                                       $tag = $wpdb->escape($tag);
+                                                       $tag_id = wp_insert_term($tag, $ta);
+                                                       if ( is_wp_error($tag_id) )
+                                                               continue;
+                                                       $tag_id = $tag_id['term_id'];
+                                               }
+                                               $post_tags[] = intval($tag_id);
+                                       }
+                                       wp_set_post_terms($post_id, $post_tags, $ta, true);
+                               }
+                       }
+                       
+
                        // Add tags.
                        if (count($tags) > 0) {
                                $post_tags = array();