diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index 467e7bb9e0..f41dd15bec 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -1,5 +1,8 @@
domain) ) {
+ return 'http://'.$current_site->domain.$current_site->path;
+ }
+ // wp: the blog url
+ else {
+ return get_bloginfo_rss('url');
+ }
+}
+
function wxr_cat_name($c) {
if ( empty($c->name) )
return;
@@ -105,12 +121,18 @@ function wxr_post_taxonomy() {
if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
$cat_name = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
+ // for backwards compatibility
$the_list .= "\n\t\t\n";
+ // forwards compatibility: use a unique identifier for each cat to avoid clashes
+ // http://trac.wordpress.org/ticket/5447
+ $the_list .= "\n\t\tslug}\">\n";
}
if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
$tag_name = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
$the_list .= "\n\t\t\n";
+ // forwards compatibility as above
+ $the_list .= "\n\t\tslug}\">\n";
}
echo $the_list;
@@ -140,7 +162,7 @@ echo '\n";
xmlns:content="http://purl.org/rss/1.0/modules/content/"
xmlns:wfw="http://wellformedweb.org/CommentAPI/"
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:wp="http://wordpress.org/export/1.0/"
+ xmlns:wp="http://wordpress.org/export//"
>
@@ -150,6 +172,9 @@ echo '\n";
http://wordpress.org/?v=
+
+
+
slug; ?>parent ? $cats[$c->parent]->name : ''; ?>
@@ -187,6 +212,10 @@ echo '\n";
menu_order; ?>
post_type; ?>
post_type == 'attachment') { ?>
+ID); ?>
+
+get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");
if ( $postmeta ) {
?>
@@ -212,6 +241,7 @@ if ( $comments ) { foreach ( $comments as $c ) { ?>
comment_approved; ?>
comment_type; ?>
comment_parent; ?>
+user_id; ?>