WP Merge to rev 5499, this is a big one! Test it before you put it live!

Test only, not for production use yet


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@972 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 24 insertions, 15 deletions

diff --git a/wp-admin/export.php b/wp-admin/export.php
index b763412..51e007a 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -123,22 +123,30 @@ function wxr_category_description($c) {
 

 	echo '<wp:category_description>' . wxr_cdata($c->category_description) . '</wp:category_description>';

 }

+

+print '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";

+

 ?>

-<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->

-<!-- It contains information about your blog's posts, comments, and categories. -->

-<!-- You may use this file to transfer that content from one site to another. -->

-<!-- This file is not intended to serve as a complete backup of your blog. -->

-

-<!-- To import this information into a WordPress blog follow these steps. -->

-<!-- 1. Log into that blog as an administrator. -->

-<!-- 2. Go to Manage: Import in the blog's admin panels. -->

-<!-- 3. Choose "WordPress" from the list. -->

-<!-- 4. Upload this file using the form provided on that page. -->

-<!-- 5. You will first be asked to map the authors in this export file to users -->

-<!--    on the blog.  For each author, you may choose to map to an -->

-<!--    existing user on the blog or to create a new user -->

-<!-- 6. WordPress will then import each of the posts, comments, and categories -->

-<!--    contained in this file into your blog -->

+

+<!--

+	This is a WordPress eXtended RSS file generated by WordPress as an export of 

+	your blog. It contains information about your blog's posts, comments, and 

+	categories. You may use this file to transfer that content from one site to 

+	another. This file is not intended to serve as a complete backup of your 

+	blog.

+	

+	To import this information into a WordPress blog follow these steps:

+	

+	1.	Log into that blog as an administrator.

+	2.	Go to Manage > Import in the blog's admin.

+	3.	Choose "WordPress" from the list of importers.

+	4.	Upload this file using the form provided on that page.

+	5.	You will first be asked to map the authors in this export file to users 

+		on the blog. For each author, you may choose to map an existing user on 

+		the blog or to create a new user.

+	6.	WordPress will then import each of the posts, comments, and categories 

+		contained in this file onto your blog.

+-->

 

 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->

 <rss version="2.0"

@@ -178,6 +186,7 @@ function wxr_category_description($c) {
 <wp:post_name><?php echo $post->post_name; ?></wp:post_name>

 <wp:status><?php echo $post->post_status; ?></wp:status>

 <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>

+<wp:menu_order><?php echo $post->menu_order; ?></wp:menu_order>

 <wp:post_type><?php echo $post->post_type; ?></wp:post_type>

 <?php

 $postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");