From aae5b160f307adf0703ae8f7c2b158b91570ec95 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 1 Dec 2006 12:27:29 +0000
Subject: WP Merge to 4578, except for script-loader

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@817 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/export.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'wp-admin/export.php')

diff --git a/wp-admin/export.php b/wp-admin/export.php
index 2f69320..1a49700 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -50,9 +50,8 @@ global $wpdb, $posts, $post;
 $filename = 'wordpress.' . date('Y-m-d') . '.xml';
 
 header('Content-Description: File Transfer');
-header('Content-Type: application/octet-stream');
 header("Content-Disposition: attachment; filename=$filename");
-header('Content-type: text/wxr+xml; charset=' . get_option('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 
 $where = '';
 if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {
@@ -127,12 +126,18 @@ function wxr_category_description($c) {
 <!-- 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. -->
-<!-- To import this information into a WordPress blog, -->
-<!-- 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 -->
-<!-- You will be taken through the simple import procedure. -->
+<!-- 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 -->
 
 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->
 <rss version="2.0"
-- 
cgit