Index: src/wp-admin/includes/export.php
===================================================================
--- src/wp-admin/includes/export.php	(revision 37590)
+++ src/wp-admin/includes/export.php	(working copy)
@@ -7,15 +7,6 @@
  */
 
 /**
- * Version number for the export format.
- *
- * Bump this when something changes that might affect compatibility.
- *
- * @since 2.5.0
- */
-define( 'WXR_VERSION', '1.2' );
-
-/**
  * Generates the WXR export file for download.
  *
  * @since 2.1.0
@@ -137,242 +128,8 @@
 		unset( $categories, $custom_taxonomies, $custom_terms );
 	}
 
-	/**
-	 * Wrap given string in XML CDATA tag.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $str String to wrap in XML CDATA tag.
-	 * @return string
-	 */
-	function wxr_cdata( $str ) {
-		if ( ! seems_utf8( $str ) ) {
-			$str = utf8_encode( $str );
-		}
-		// $str = ent2ncr(esc_html($str));
-		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
+	require_once __DIR__ . '/wxr.php';
 
-		return $str;
-	}
-
-	/**
-	 * Return the URL of the site
-	 *
-	 * @since 2.5.0
-	 *
-	 * @return string Site URL.
-	 */
-	function wxr_site_url() {
-		// Multisite: the base URL.
-		if ( is_multisite() )
-			return network_home_url();
-		// WordPress (single site): the blog URL.
-		else
-			return get_bloginfo_rss( 'url' );
-	}
-
-	/**
-	 * Output a cat_name XML tag from a given category object
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param object $category Category Object
-	 */
-	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
-			return;
-
-		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . "</wp:cat_name>\n";
-	}
-
-	/**
-	 * Output a category_description XML tag from a given category object
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param object $category Category Object
-	 */
-	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
-			return;
-
-		echo '<wp:category_description>' . wxr_cdata( $category->description ) . "</wp:category_description>\n";
-	}
-
-	/**
-	 * Output a tag_name XML tag from a given tag object
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param object $tag Tag Object
-	 */
-	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
-			return;
-
-		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . "</wp:tag_name>\n";
-	}
-
-	/**
-	 * Output a tag_description XML tag from a given tag object
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param object $tag Tag Object
-	 */
-	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
-			return;
-
-		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . "</wp:tag_description>\n";
-	}
-
-	/**
-	 * Output a term_name XML tag from a given term object
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param object $term Term Object
-	 */
-	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
-			return;
-
-		echo '<wp:term_name>' . wxr_cdata( $term->name ) . "</wp:term_name>\n";
-	}
-
-	/**
-	 * Output a term_description XML tag from a given term object
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param object $term Term Object
-	 */
-	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
-			return;
-
-		echo "\t\t<wp:term_description>" . wxr_cdata( $term->description ) . "</wp:term_description>\n";
-	}
-
-	/**
-	 * Output termmeta XML tags for a given term object.
-	 *
-	 * @since 4.6.0
-	 *
-	 * @param WP_Term $term Term object.
-	 */
-	function wxr_term_meta( $term ) {
-		global $wpdb;
-
-		$termmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->termmeta WHERE term_id = %d", $term->term_id ) );
-
-		foreach ( $termmeta as $meta ) {
-			/**
-			 * Filters whether to selectively skip term meta used for WXR exports.
-			 *
-			 * Returning a truthy value to the filter will skip the current meta
-			 * object from being exported.
-			 *
-			 * @since 4.6.0
-			 *
-			 * @param bool   $skip     Whether to skip the current piece of term meta. Default false.
-			 * @param string $meta_key Current meta key.
-			 * @param object $meta     Current meta object.
-			 */
-			if ( ! apply_filters( 'wxr_export_skip_termmeta', false, $meta->meta_key, $meta ) ) {
-				printf( "\t\t<wp:termmeta>\n\t\t\t<wp:meta_key>%s</wp:meta_key>\n\t\t\t<wp:meta_value>%s</wp:meta_value>\n\t\t</wp:termmeta>\n", wxr_cdata( $meta->meta_key ), wxr_cdata( $meta->meta_value ) );
-			}
-		}
-	}
-
-	/**
-	 * Output list of authors with posts
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param array $post_ids Array of post IDs to filter the query by. Optional.
-	 */
-	function wxr_authors_list( array $post_ids = null ) {
-		global $wpdb;
-
-		if ( !empty( $post_ids ) ) {
-			$post_ids = array_map( 'absint', $post_ids );
-			$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
-		} else {
-			$and = '';
-		}
-
-		$authors = array();
-		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
-
-		$authors = array_filter( $authors );
-
-		foreach ( $authors as $author ) {
-			echo "\t<wp:author>";
-			echo '<wp:author_id>' . intval( $author->ID ) . '</wp:author_id>';
-			echo '<wp:author_login>' . wxr_cdata( $author->user_login ) . '</wp:author_login>';
-			echo '<wp:author_email>' . wxr_cdata( $author->user_email ) . '</wp:author_email>';
-			echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
-			echo '<wp:author_first_name>' . wxr_cdata( $author->first_name ) . '</wp:author_first_name>';
-			echo '<wp:author_last_name>' . wxr_cdata( $author->last_name ) . '</wp:author_last_name>';
-			echo "</wp:author>\n";
-		}
-	}
-
-	/**
-	 * Ouput all navigation menu terms
-	 *
-	 * @since 3.1.0
-	 */
-	function wxr_nav_menu_terms() {
-		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
-			return;
-
-		foreach ( $nav_menus as $menu ) {
-			echo "\t<wp:term>";
-			echo '<wp:term_id>' . intval( $menu->term_id ) . '</wp:term_id>';
-			echo '<wp:term_taxonomy>nav_menu</wp:term_taxonomy>';
-			echo '<wp:term_slug>' . wxr_cdata( $menu->slug ) . '</wp:term_slug>';
-			wxr_term_name( $menu );
-			echo "</wp:term>\n";
-		}
-	}
-
-	/**
-	 * Output list of taxonomy terms, in XML tag format, associated with a post
-	 *
-	 * @since 2.3.0
-	 */
-	function wxr_post_taxonomy() {
-		$post = get_post();
-
-		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
-			return;
-		$terms = wp_get_object_terms( $post->ID, $taxonomies );
-
-		foreach ( (array) $terms as $term ) {
-			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
-		}
-	}
-
-	/**
-	 *
-	 * @param bool   $return_me
-	 * @param string $meta_key
-	 * @return bool
-	 */
-	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
-			$return_me = true;
-		return $return_me;
-	}
 	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
 
 	echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
Index: src/wp-admin/includes/wxr.php
===================================================================
--- src/wp-admin/includes/wxr.php	(revision 37590)
+++ src/wp-admin/includes/wxr.php	(working copy)
@@ -1,6 +1,6 @@
 <?php
 /**
- * WordPress Export Administration API
+ * WordPress Export Helper
  *
  * @package WordPress
  * @subpackage Administration
@@ -16,578 +16,238 @@
 define( 'WXR_VERSION', '1.2' );
 
 /**
- * Generates the WXR export file for download.
+ * Wrap given string in XML CDATA tag.
  *
  * @since 2.1.0
  *
- * @global wpdb    $wpdb
- * @global WP_Post $post
- *
- * @param array $args Filters defining what should be included in the export.
+ * @param string $str String to wrap in XML CDATA tag.
+ * @return string
  */
-function export_wp( $args = array() ) {
-	global $wpdb, $post;
-
-	$defaults = array( 'content' => 'all', 'author' => false, 'category' => false,
-		'start_date' => false, 'end_date' => false, 'status' => false,
-	);
-	$args = wp_parse_args( $args, $defaults );
-
-	/**
-	 * Fires at the beginning of an export, before any headers are sent.
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param array $args An array of export arguments.
-	 */
-	do_action( 'export_wp', $args );
-
-	$sitename = sanitize_key( get_bloginfo( 'name' ) );
-	if ( ! empty( $sitename ) ) {
-		$sitename .= '.';
+function wxr_cdata( $str ) {
+	if ( ! seems_utf8( $str ) ) {
+		$str = utf8_encode( $str );
 	}
-	$date = date( 'Y-m-d' );
-	$wp_filename = $sitename . 'wordpress.' . $date . '.xml';
-	/**
-	 * Filters the export filename.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param string $wp_filename The name of the file for download.
-	 * @param string $sitename    The site name.
-	 * @param string $date        Today's date, formatted.
-	 */
-	$filename = apply_filters( 'export_wp_filename', $wp_filename, $sitename, $date );
+	// $str = ent2ncr(esc_html($str));
+	$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
 
-	header( 'Content-Description: File Transfer' );
-	header( 'Content-Disposition: attachment; filename=' . $filename );
-	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+	return $str;
+}
 
-	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
-		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
-			$args['content'] = 'post';
-
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
-	} else {
-		$post_types = get_post_types( array( 'can_export' => true ) );
-		$esses = array_fill( 0, count($post_types), '%s' );
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
-	}
-
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
-		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
+/**
+ * Return the URL of the site
+ *
+ * @since 2.5.0
+ *
+ * @return string Site URL.
+ */
+function wxr_site_url() {
+	// Multisite: the base URL.
+	if ( is_multisite() )
+		return network_home_url();
+	// WordPress (single site): the blog URL.
 	else
-		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+		return get_bloginfo_rss( 'url' );
+}
 
-	$join = '';
-	if ( $args['category'] && 'post' == $args['content'] ) {
-		if ( $term = term_exists( $args['category'], 'category' ) ) {
-			$join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
-			$where .= $wpdb->prepare( " AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id'] );
-		}
-	}
+/**
+ * Output a cat_name XML tag from a given category object
+ *
+ * @since 2.1.0
+ *
+ * @param object $category Category Object
+ */
+function wxr_cat_name( $category ) {
+	if ( empty( $category->name ) )
+		return;
 
-	if ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) {
-		if ( $args['author'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+	echo '<wp:cat_name>' . wxr_cdata( $category->name ) . "</wp:cat_name>\n";
+}
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+/**
+ * Output a category_description XML tag from a given category object
+ *
+ * @since 2.1.0
+ *
+ * @param object $category Category Object
+ */
+function wxr_category_description( $category ) {
+	if ( empty( $category->description ) )
+		return;
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
-	}
+	echo '<wp:category_description>' . wxr_cdata( $category->description ) . "</wp:category_description>\n";
+}
 
-	// Grab a snapshot of post IDs, just in case it changes during the export.
-	$post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" );
+/**
+ * Output a tag_name XML tag from a given tag object
+ *
+ * @since 2.3.0
+ *
+ * @param object $tag Tag Object
+ */
+function wxr_tag_name( $tag ) {
+	if ( empty( $tag->name ) )
+		return;
 
-	/*
-	 * Get the requested terms ready, empty unless posts filtered by category
-	 * or all content.
-	 */
-	$cats = $tags = $terms = array();
-	if ( isset( $term ) && $term ) {
-		$cat = get_term( $term['term_id'], 'category' );
-		$cats = array( $cat->term_id => $cat );
-		unset( $term, $cat );
-	} elseif ( 'all' == $args['content'] ) {
-		$categories = (array) get_categories( array( 'get' => 'all' ) );
-		$tags = (array) get_tags( array( 'get' => 'all' ) );
+	echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . "</wp:tag_name>\n";
+}
 
-		$custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
-		$custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+/**
+ * Output a tag_description XML tag from a given tag object
+ *
+ * @since 2.3.0
+ *
+ * @param object $tag Tag Object
+ */
+function wxr_tag_description( $tag ) {
+	if ( empty( $tag->description ) )
+		return;
 
-		// Put categories in order with no child going before its parent.
-		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
-				$cats[$cat->term_id] = $cat;
-			else
-				$categories[] = $cat;
-		}
+	echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . "</wp:tag_description>\n";
+}
 
-		// Put terms in order with no child going before its parent.
-		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
-				$terms[$t->term_id] = $t;
-			else
-				$custom_terms[] = $t;
-		}
+/**
+ * Output a term_name XML tag from a given term object
+ *
+ * @since 2.9.0
+ *
+ * @param object $term Term Object
+ */
+function wxr_term_name( $term ) {
+	if ( empty( $term->name ) )
+		return;
 
-		unset( $categories, $custom_taxonomies, $custom_terms );
-	}
+	echo '<wp:term_name>' . wxr_cdata( $term->name ) . "</wp:term_name>\n";
+}
 
-	/**
-	 * Wrap given string in XML CDATA tag.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $str String to wrap in XML CDATA tag.
-	 * @return string
-	 */
-	function wxr_cdata( $str ) {
-		if ( ! seems_utf8( $str ) ) {
-			$str = utf8_encode( $str );
-		}
-		// $str = ent2ncr(esc_html($str));
-		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
+/**
+ * Output a term_description XML tag from a given term object
+ *
+ * @since 2.9.0
+ *
+ * @param object $term Term Object
+ */
+function wxr_term_description( $term ) {
+	if ( empty( $term->description ) )
+		return;
 
-		return $str;
-	}
+	echo "\t\t<wp:term_description>" . wxr_cdata( $term->description ) . "</wp:term_description>\n";
+}
 
-	/**
-	 * Return the URL of the site
-	 *
-	 * @since 2.5.0
-	 *
-	 * @return string Site URL.
-	 */
-	function wxr_site_url() {
-		// Multisite: the base URL.
-		if ( is_multisite() )
-			return network_home_url();
-		// WordPress (single site): the blog URL.
-		else
-			return get_bloginfo_rss( 'url' );
-	}
+/**
+ * Output termmeta XML tags for a given term object.
+ *
+ * @since 4.6.0
+ *
+ * @param WP_Term $term Term object.
+ */
+function wxr_term_meta( $term ) {
+	global $wpdb;
 
-	/**
-	 * Output a cat_name XML tag from a given category object
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param object $category Category Object
-	 */
-	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
-			return;
+	$termmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->termmeta WHERE term_id = %d", $term->term_id ) );
 
-		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . "</wp:cat_name>\n";
+	foreach ( $termmeta as $meta ) {
+		/**
+		 * Filters whether to selectively skip term meta used for WXR exports.
+		 *
+		 * Returning a truthy value to the filter will skip the current meta
+		 * object from being exported.
+		 *
+		 * @since 4.6.0
+		 *
+		 * @param bool   $skip     Whether to skip the current piece of term meta. Default false.
+		 * @param string $meta_key Current meta key.
+		 * @param object $meta     Current meta object.
+		 */
+		if ( ! apply_filters( 'wxr_export_skip_termmeta', false, $meta->meta_key, $meta ) ) {
+			printf( "\t\t<wp:termmeta>\n\t\t\t<wp:meta_key>%s</wp:meta_key>\n\t\t\t<wp:meta_value>%s</wp:meta_value>\n\t\t</wp:termmeta>\n", wxr_cdata( $meta->meta_key ), wxr_cdata( $meta->meta_value ) );
+		}
 	}
+}
 
-	/**
-	 * Output a category_description XML tag from a given category object
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param object $category Category Object
-	 */
-	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
-			return;
+/**
+ * Output list of authors with posts
+ *
+ * @since 3.1.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $post_ids Array of post IDs to filter the query by. Optional.
+ */
+function wxr_authors_list( array $post_ids = null ) {
+	global $wpdb;
 
-		echo '<wp:category_description>' . wxr_cdata( $category->description ) . "</wp:category_description>\n";
+	if ( !empty( $post_ids ) ) {
+		$post_ids = array_map( 'absint', $post_ids );
+		$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
+	} else {
+		$and = '';
 	}
 
-	/**
-	 * Output a tag_name XML tag from a given tag object
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param object $tag Tag Object
-	 */
-	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
-			return;
+	$authors = array();
+	$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
+	foreach ( (array) $results as $result )
+		$authors[] = get_userdata( $result->post_author );
 
-		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . "</wp:tag_name>\n";
-	}
+	$authors = array_filter( $authors );
 
-	/**
-	 * Output a tag_description XML tag from a given tag object
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param object $tag Tag Object
-	 */
-	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
-			return;
-
-		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . "</wp:tag_description>\n";
+	foreach ( $authors as $author ) {
+		echo "\t<wp:author>";
+		echo '<wp:author_id>' . intval( $author->ID ) . '</wp:author_id>';
+		echo '<wp:author_login>' . wxr_cdata( $author->user_login ) . '</wp:author_login>';
+		echo '<wp:author_email>' . wxr_cdata( $author->user_email ) . '</wp:author_email>';
+		echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
+		echo '<wp:author_first_name>' . wxr_cdata( $author->first_name ) . '</wp:author_first_name>';
+		echo '<wp:author_last_name>' . wxr_cdata( $author->last_name ) . '</wp:author_last_name>';
+		echo "</wp:author>\n";
 	}
+}
 
-	/**
-	 * Output a term_name XML tag from a given term object
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param object $term Term Object
-	 */
-	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
-			return;
+/**
+ * Ouput all navigation menu terms
+ *
+ * @since 3.1.0
+ */
+function wxr_nav_menu_terms() {
+	$nav_menus = wp_get_nav_menus();
+	if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
+		return;
 
-		echo '<wp:term_name>' . wxr_cdata( $term->name ) . "</wp:term_name>\n";
+	foreach ( $nav_menus as $menu ) {
+		echo "\t<wp:term>";
+		echo '<wp:term_id>' . intval( $menu->term_id ) . '</wp:term_id>';
+		echo '<wp:term_taxonomy>nav_menu</wp:term_taxonomy>';
+		echo '<wp:term_slug>' . wxr_cdata( $menu->slug ) . '</wp:term_slug>';
+		wxr_term_name( $menu );
+		echo "</wp:term>\n";
 	}
+}
 
-	/**
-	 * Output a term_description XML tag from a given term object
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param object $term Term Object
-	 */
-	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
-			return;
+/**
+ * Output list of taxonomy terms, in XML tag format, associated with a post
+ *
+ * @since 2.3.0
+ */
+function wxr_post_taxonomy() {
+	$post = get_post();
 
-		echo "\t\t<wp:term_description>" . wxr_cdata( $term->description ) . "</wp:term_description>\n";
-	}
+	$taxonomies = get_object_taxonomies( $post->post_type );
+	if ( empty( $taxonomies ) )
+		return;
+	$terms = wp_get_object_terms( $post->ID, $taxonomies );
 
-	/**
-	 * Output termmeta XML tags for a given term object.
-	 *
-	 * @since 4.6.0
-	 *
-	 * @param WP_Term $term Term object.
-	 */
-	function wxr_term_meta( $term ) {
-		global $wpdb;
-
-		$termmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->termmeta WHERE term_id = %d", $term->term_id ) );
-
-		foreach ( $termmeta as $meta ) {
-			/**
-			 * Filters whether to selectively skip term meta used for WXR exports.
-			 *
-			 * Returning a truthy value to the filter will skip the current meta
-			 * object from being exported.
-			 *
-			 * @since 4.6.0
-			 *
-			 * @param bool   $skip     Whether to skip the current piece of term meta. Default false.
-			 * @param string $meta_key Current meta key.
-			 * @param object $meta     Current meta object.
-			 */
-			if ( ! apply_filters( 'wxr_export_skip_termmeta', false, $meta->meta_key, $meta ) ) {
-				printf( "\t\t<wp:termmeta>\n\t\t\t<wp:meta_key>%s</wp:meta_key>\n\t\t\t<wp:meta_value>%s</wp:meta_value>\n\t\t</wp:termmeta>\n", wxr_cdata( $meta->meta_key ), wxr_cdata( $meta->meta_value ) );
-			}
-		}
+	foreach ( (array) $terms as $term ) {
+		echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
 	}
+}
 
-	/**
-	 * Output list of authors with posts
-	 *
-	 * @since 3.1.0
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param array $post_ids Array of post IDs to filter the query by. Optional.
-	 */
-	function wxr_authors_list( array $post_ids = null ) {
-		global $wpdb;
-
-		if ( !empty( $post_ids ) ) {
-			$post_ids = array_map( 'absint', $post_ids );
-			$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
-		} else {
-			$and = '';
-		}
-
-		$authors = array();
-		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
-
-		$authors = array_filter( $authors );
-
-		foreach ( $authors as $author ) {
-			echo "\t<wp:author>";
-			echo '<wp:author_id>' . intval( $author->ID ) . '</wp:author_id>';
-			echo '<wp:author_login>' . wxr_cdata( $author->user_login ) . '</wp:author_login>';
-			echo '<wp:author_email>' . wxr_cdata( $author->user_email ) . '</wp:author_email>';
-			echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
-			echo '<wp:author_first_name>' . wxr_cdata( $author->first_name ) . '</wp:author_first_name>';
-			echo '<wp:author_last_name>' . wxr_cdata( $author->last_name ) . '</wp:author_last_name>';
-			echo "</wp:author>\n";
-		}
-	}
-
-	/**
-	 * Ouput all navigation menu terms
-	 *
-	 * @since 3.1.0
-	 */
-	function wxr_nav_menu_terms() {
-		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
-			return;
-
-		foreach ( $nav_menus as $menu ) {
-			echo "\t<wp:term>";
-			echo '<wp:term_id>' . intval( $menu->term_id ) . '</wp:term_id>';
-			echo '<wp:term_taxonomy>nav_menu</wp:term_taxonomy>';
-			echo '<wp:term_slug>' . wxr_cdata( $menu->slug ) . '</wp:term_slug>';
-			wxr_term_name( $menu );
-			echo "</wp:term>\n";
-		}
-	}
-
-	/**
-	 * Output list of taxonomy terms, in XML tag format, associated with a post
-	 *
-	 * @since 2.3.0
-	 */
-	function wxr_post_taxonomy() {
-		$post = get_post();
-
-		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
-			return;
-		$terms = wp_get_object_terms( $post->ID, $taxonomies );
-
-		foreach ( (array) $terms as $term ) {
-			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
-		}
-	}
-
-	/**
-	 *
-	 * @param bool   $return_me
-	 * @param string $meta_key
-	 * @return bool
-	 */
-	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
-			$return_me = true;
-		return $return_me;
-	}
-	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
-
-	echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
-
-	?>
-<!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
-<!-- It contains information about your site's posts, pages, comments, categories, and other content. -->
-<!-- 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 site. -->
-
-<!-- To import this information into a WordPress site follow these steps: -->
-<!-- 1. Log in to that site as an administrator. -->
-<!-- 2. Go to Tools: Import in the WordPress admin panel. -->
-<!-- 3. Install the "WordPress" importer from the list. -->
-<!-- 4. Activate & Run Importer. -->
-<!-- 5. Upload this file using the form provided on that page. -->
-<!-- 6. You will first be asked to map the authors in this export file to users -->
-<!--    on the site. For each author, you may choose to map to an -->
-<!--    existing user on the site or to create a new user. -->
-<!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
-<!--    contained in this file into your site. -->
-
-<?php the_generator( 'export' ); ?>
-<rss version="2.0"
-	xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
-	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/<?php echo WXR_VERSION; ?>/"
->
-
-<channel>
-	<title><?php bloginfo_rss( 'name' ); ?></title>
-	<link><?php bloginfo_rss( 'url' ); ?></link>
-	<description><?php bloginfo_rss( 'description' ); ?></description>
-	<pubDate><?php echo date( 'D, d M Y H:i:s +0000' ); ?></pubDate>
-	<language><?php bloginfo_rss( 'language' ); ?></language>
-	<wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
-	<wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
-	<wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
-
-<?php wxr_authors_list( $post_ids ); ?>
-
-<?php foreach ( $cats as $c ) : ?>
-	<wp:category>
-		<wp:term_id><?php echo intval( $c->term_id ); ?></wp:term_id>
-		<wp:category_nicename><?php echo wxr_cdata( $c->slug ); ?></wp:category_nicename>
-		<wp:category_parent><?php echo wxr_cdata( $c->parent ? $cats[$c->parent]->slug : '' ); ?></wp:category_parent>
-		<?php wxr_cat_name( $c );
-		wxr_category_description( $c );
-		wxr_term_meta( $c ); ?>
-	</wp:category>
-<?php endforeach; ?>
-<?php foreach ( $tags as $t ) : ?>
-	<wp:tag>
-		<wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
-		<wp:tag_slug><?php echo wxr_cdata( $t->slug ); ?></wp:tag_slug>
-		<?php wxr_tag_name( $t );
-		wxr_tag_description( $t );
-		wxr_term_meta( $t ); ?>
-	</wp:tag>
-<?php endforeach; ?>
-<?php foreach ( $terms as $t ) : ?>
-	<wp:term>
-		<wp:term_id><?php echo wxr_cdata( $t->term_id ); ?></wp:term_id>
-		<wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy>
-		<wp:term_slug><?php echo wxr_cdata( $t->slug ); ?></wp:term_slug>
-		<wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[$t->parent]->slug : '' ); ?></wp:term_parent>
-		<?php wxr_term_name( $t );
-		wxr_term_description( $t );
-		wxr_term_meta( $t ); ?>
-	</wp:term>
-<?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
-
-	<?php
-	/** This action is documented in wp-includes/feed-rss2.php */
-	do_action( 'rss2_head' );
-	?>
-
-<?php if ( $post_ids ) {
-	/**
-	 * @global WP_Query $wp_query
-	 */
-	global $wp_query;
-
-	// Fake being in the loop.
-	$wp_query->in_the_loop = true;
-
-	// Fetch 20 posts at a time rather than loading the entire table into memory.
-	while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
-	$where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
-	$posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
-
-	// Begin Loop.
-	foreach ( $posts as $post ) {
-		setup_postdata( $post );
-		$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
-?>
-	<item>
-		<title><?php
-			/** This filter is documented in wp-includes/feed.php */
-			echo apply_filters( 'the_title_rss', $post->post_title );
-		?></title>
-		<link><?php the_permalink_rss() ?></link>
-		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
-		<dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
-		<guid isPermaLink="false"><?php the_guid(); ?></guid>
-		<description></description>
-		<content:encoded><?php
-			/**
-			 * Filters the post content used for WXR exports.
-			 *
-			 * @since 2.5.0
-			 *
-			 * @param string $post_content Content of the current post.
-			 */
-			echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
-		?></content:encoded>
-		<excerpt:encoded><?php
-			/**
-			 * Filters the post excerpt used for WXR exports.
-			 *
-			 * @since 2.6.0
-			 *
-			 * @param string $post_excerpt Excerpt for the current post.
-			 */
-			echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
-		?></excerpt:encoded>
-		<wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
-		<wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>
-		<wp:post_date_gmt><?php echo wxr_cdata( $post->post_date_gmt ); ?></wp:post_date_gmt>
-		<wp:comment_status><?php echo wxr_cdata( $post->comment_status ); ?></wp:comment_status>
-		<wp:ping_status><?php echo wxr_cdata( $post->ping_status ); ?></wp:ping_status>
-		<wp:post_name><?php echo wxr_cdata( $post->post_name ); ?></wp:post_name>
-		<wp:status><?php echo wxr_cdata( $post->post_status ); ?></wp:status>
-		<wp:post_parent><?php echo intval( $post->post_parent ); ?></wp:post_parent>
-		<wp:menu_order><?php echo intval( $post->menu_order ); ?></wp:menu_order>
-		<wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
-		<wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
-		<wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
-<?php	if ( $post->post_type == 'attachment' ) : ?>
-		<wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
-<?php 	endif; ?>
-<?php 	wxr_post_taxonomy(); ?>
-<?php	$postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
-		foreach ( $postmeta as $meta ) :
-			/**
-			 * Filters whether to selectively skip post meta used for WXR exports.
-			 *
-			 * Returning a truthy value to the filter will skip the current meta
-			 * object from being exported.
-			 *
-			 * @since 3.3.0
-			 *
-			 * @param bool   $skip     Whether to skip the current post meta. Default false.
-			 * @param string $meta_key Current meta key.
-			 * @param object $meta     Current meta object.
-			 */
-			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) )
-				continue;
-		?>
-		<wp:postmeta>
-			<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
-			<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
-		</wp:postmeta>
-<?php	endforeach;
-
-		$_comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
-		$comments = array_map( 'get_comment', $_comments );
-		foreach ( $comments as $c ) : ?>
-		<wp:comment>
-			<wp:comment_id><?php echo intval( $c->comment_ID ); ?></wp:comment_id>
-			<wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
-			<wp:comment_author_email><?php echo wxr_cdata( $c->comment_author_email ); ?></wp:comment_author_email>
-			<wp:comment_author_url><?php echo esc_url_raw( $c->comment_author_url ); ?></wp:comment_author_url>
-			<wp:comment_author_IP><?php echo wxr_cdata( $c->comment_author_IP ); ?></wp:comment_author_IP>
-			<wp:comment_date><?php echo wxr_cdata( $c->comment_date ); ?></wp:comment_date>
-			<wp:comment_date_gmt><?php echo wxr_cdata( $c->comment_date_gmt ); ?></wp:comment_date_gmt>
-			<wp:comment_content><?php echo wxr_cdata( $c->comment_content ) ?></wp:comment_content>
-			<wp:comment_approved><?php echo wxr_cdata( $c->comment_approved ); ?></wp:comment_approved>
-			<wp:comment_type><?php echo wxr_cdata( $c->comment_type ); ?></wp:comment_type>
-			<wp:comment_parent><?php echo intval( $c->comment_parent ); ?></wp:comment_parent>
-			<wp:comment_user_id><?php echo intval( $c->user_id ); ?></wp:comment_user_id>
-<?php		$c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-			foreach ( $c_meta as $meta ) :
-				/**
-				 * Filters whether to selectively skip comment meta used for WXR exports.
-				 *
-				 * Returning a truthy value to the filter will skip the current meta
-				 * object from being exported.
-				 *
-				 * @since 4.0.0
-				 *
-				 * @param bool   $skip     Whether to skip the current comment meta. Default false.
-				 * @param string $meta_key Current meta key.
-				 * @param object $meta     Current meta object.
-				 */
-				if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
-					continue;
-				}
-			?>
-			<wp:commentmeta>
-				<wp:meta_key><?php echo wxr_cdata( $meta->meta_key ); ?></wp:meta_key>
-				<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
-			</wp:commentmeta>
-<?php		endforeach; ?>
-		</wp:comment>
-<?php	endforeach; ?>
-	</item>
-<?php
-	}
-	}
-} ?>
-</channel>
-</rss>
-<?php
-}
+/**
+ *
+ * @param bool   $return_me
+ * @param string $meta_key
+ * @return bool
+ */
+function wxr_filter_postmeta( $return_me, $meta_key ) {
+	if ( '_edit_lock' == $meta_key )
+		$return_me = true;
+	return $return_me;
+}
\ No newline at end of file
Index: src/wp-includes/comment-template.php
===================================================================
--- src/wp-includes/comment-template.php	(revision 37590)
+++ src/wp-includes/comment-template.php	(working copy)
@@ -1168,9 +1168,9 @@
  */
 function comments_open( $post_id = null ) {
 
-	$_post = get_post($post_id);
+	$_post = get_post( $post_id );
 
-	$open = ( 'open' == $_post->comment_status );
+	$open = $_post && isset( $_post->comment_status ) && ( 'open' == $_post->comment_status );
 
 	/**
 	 * Filters whether the current post is open for comments.
Index: tests/phpunit/tests/export/export-wp.php
===================================================================
--- tests/phpunit/tests/export/export-wp.php	(revision 37590)
+++ tests/phpunit/tests/export/export-wp.php	(working copy)
@@ -1,253 +1,36 @@
 <?php
 
-require_once dirname( __FILE__ ) . '/base.php';
-
 /**
  * @group import
  */
-class Tests_Import_Import extends WP_Import_UnitTestCase {
-	function setUp() {
+class Tests_Export_Export_Wp extends WP_UnitTestCase {
+	function setUp()
+	{
 		parent::setUp();
 
-		if ( ! defined( 'WP_IMPORTING' ) )
-			define( 'WP_IMPORTING', true );
-
-		if ( ! defined( 'WP_LOAD_IMPORTERS' ) )
-			define( 'WP_LOAD_IMPORTERS', true );
-
-		add_filter( 'import_allow_create_users', '__return_true' );
-
-		if ( ! file_exists( DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php' ) ) {
-			$this->markTestSkipped( 'WordPress Importer plugin is not installed.' );
-		}
-
-		require_once DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php';
-
-		global $wpdb;
-		// crude but effective: make sure there's no residual data in the main tables
-		foreach ( array('posts', 'postmeta', 'comments', 'terms', 'term_taxonomy', 'term_relationships', 'users', 'usermeta') as $table)
-			$wpdb->query("DELETE FROM {$wpdb->$table}");
+		require_once ABSPATH . '/wp-admin/includes/export.php';
 	}
 
-	function tearDown() {
-		remove_filter( 'import_allow_create_users', '__return_true' );
 
-		parent::tearDown();
-	}
+	/**
+	 * export_wp() shall not throw errors due to previously declared functions.
+	 *
+	 * As of ticket #33563 calling `export_wp()` multiple times causes WP to die.
+	 * The function has been refactored and should no longer be such a pain.
+	 *
+	 * @see https://core.trac.wordpress.org/ticket/33563
+	 *
+	 * @runInSeparateProcess
+	 */
+	function test_it_can_run_multiple_times() {
 
-	function test_small_import() {
-		global $wpdb;
-
-		$authors = array( 'admin' => false, 'editor' => false, 'author' => false );
-		$this->_import_wp( DIR_TESTDATA . '/export/small-export.xml', $authors );
-
-		// ensure that authors were imported correctly
-		$user_count = count_users();
-		$this->assertEquals( 3, $user_count['total_users'] );
-		$admin = get_user_by( 'login', 'admin' );
-		$this->assertEquals( 'admin', $admin->user_login );
-		$this->assertEquals( 'local@host.null', $admin->user_email );
-		$editor = get_user_by( 'login', 'editor' );
-		$this->assertEquals( 'editor', $editor->user_login );
-		$this->assertEquals( 'editor@example.org', $editor->user_email );
-		$this->assertEquals( 'FirstName', $editor->user_firstname );
-		$this->assertEquals( 'LastName', $editor->user_lastname );
-		$author = get_user_by( 'login', 'author' );
-		$this->assertEquals( 'author', $author->user_login );
-		$this->assertEquals( 'author@example.org', $author->user_email );
-
-		// check that terms were imported correctly
-		$this->assertEquals( 30, wp_count_terms( 'category' ) );
-		$this->assertEquals( 3, wp_count_terms( 'post_tag' ) );
-		$foo = get_term_by( 'slug', 'foo', 'category' );
-		$this->assertEquals( 0, $foo->parent );
-		$bar = get_term_by( 'slug', 'bar', 'category' );
-		$foo_bar = get_term_by( 'slug', 'foo-bar', 'category' );
-		$this->assertEquals( $bar->term_id, $foo_bar->parent );
-
-		// check that posts/pages were imported correctly
-		$post_count = wp_count_posts( 'post' );
-		$this->assertEquals( 5, $post_count->publish );
-		$this->assertEquals( 1, $post_count->private );
-		$page_count = wp_count_posts( 'page' );
-		$this->assertEquals( 4, $page_count->publish );
-		$this->assertEquals( 1, $page_count->draft );
-		$comment_count = wp_count_comments();
-		$this->assertEquals( 1, $comment_count->total_comments );
-
-		$posts = get_posts( array( 'numberposts' => 20, 'post_type' => 'any', 'post_status' => 'any', 'orderby' => 'ID' ) );
-		$this->assertEquals( 11, count($posts) );
-
-		$post = $posts[0];
-		$this->assertEquals( 'Many Categories', $post->post_title );
-		$this->assertEquals( 'many-categories', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID );
-		$this->assertEquals( 27, count($cats) );
-
-		$post = $posts[1];
-		$this->assertEquals( 'Non-standard post format', $post->post_title );
-		$this->assertEquals( 'non-standard-post-format', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID );
-		$this->assertEquals( 1, count($cats) );
-		$this->assertTrue( has_post_format( 'aside', $post->ID ) );
-
-		$post = $posts[2];
-		$this->assertEquals( 'Top-level Foo', $post->post_title );
-		$this->assertEquals( 'top-level-foo', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID, array( 'fields' => 'all' ) );
-		$this->assertEquals( 1, count($cats) );
-		$this->assertEquals( 'foo', $cats[0]->slug );
-
-		$post = $posts[3];
-		$this->assertEquals( 'Foo-child', $post->post_title );
-		$this->assertEquals( 'foo-child', $post->post_name );
-		$this->assertEquals( $editor->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID, array( 'fields' => 'all' ) );
-		$this->assertEquals( 1, count($cats) );
-		$this->assertEquals( 'foo-bar', $cats[0]->slug );
-
-		$post = $posts[4];
-		$this->assertEquals( 'Private Post', $post->post_title );
-		$this->assertEquals( 'private-post', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'private', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID );
-		$this->assertEquals( 1, count($cats) );
-		$tags = wp_get_post_tags( $post->ID );
-		$this->assertEquals( 3, count($tags) );
-		$this->assertEquals( 'tag1', $tags[0]->slug );
-		$this->assertEquals( 'tag2', $tags[1]->slug );
-		$this->assertEquals( 'tag3', $tags[2]->slug );
-
-		$post = $posts[5];
-		$this->assertEquals( '1-col page', $post->post_title );
-		$this->assertEquals( '1-col-page', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'page', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$this->assertEquals( 'onecolumn-page.php', get_post_meta( $post->ID, '_wp_page_template', true ) );
-
-		$post = $posts[6];
-		$this->assertEquals( 'Draft Page', $post->post_title );
-		$this->assertEquals( '', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'page', $post->post_type );
-		$this->assertEquals( 'draft', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$this->assertEquals( 'default', get_post_meta( $post->ID, '_wp_page_template', true ) );
-
-		$post = $posts[7];
-		$this->assertEquals( 'Parent Page', $post->post_title );
-		$this->assertEquals( 'parent-page', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'page', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$this->assertEquals( 'default', get_post_meta( $post->ID, '_wp_page_template', true ) );
-
-		$post = $posts[8];
-		$this->assertEquals( 'Child Page', $post->post_title );
-		$this->assertEquals( 'child-page', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'page', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( $posts[7]->ID, $post->post_parent );
-		$this->assertEquals( 'default', get_post_meta( $post->ID, '_wp_page_template', true ) );
-
-		$post = $posts[9];
-		$this->assertEquals( 'Sample Page', $post->post_title );
-		$this->assertEquals( 'sample-page', $post->post_name );
-		$this->assertEquals( $admin->ID, $post->post_author );
-		$this->assertEquals( 'page', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$this->assertEquals( 'default', get_post_meta( $post->ID, '_wp_page_template', true ) );
-
-		$post = $posts[10];
-		$this->assertEquals( 'Hello world!', $post->post_title );
-		$this->assertEquals( 'hello-world', $post->post_name );
-		$this->assertEquals( $author->ID, $post->post_author );
-		$this->assertEquals( 'post', $post->post_type );
-		$this->assertEquals( 'publish', $post->post_status );
-		$this->assertEquals( 0, $post->post_parent );
-		$cats = wp_get_post_categories( $post->ID );
-		$this->assertEquals( 1, count($cats) );
+		ob_start();
+		export_wp();
+		$export_content = ob_get_clean();
+		
+		ob_start();
+		export_wp();
+		
+		$this->assertEquals($export_content, ob_get_clean());
 	}
-
-	function test_double_import() {
-		$authors = array( 'admin' => false, 'editor' => false, 'author' => false );
-		$this->_import_wp( DIR_TESTDATA . '/export/small-export.xml', $authors );
-		$this->_import_wp( DIR_TESTDATA . '/export/small-export.xml', $authors );
-
-		$user_count = count_users();
-		$this->assertEquals( 3, $user_count['total_users'] );
-		$admin = get_user_by( 'login', 'admin' );
-		$this->assertEquals( 'admin', $admin->user_login );
-		$this->assertEquals( 'local@host.null', $admin->user_email );
-		$editor = get_user_by( 'login', 'editor' );
-		$this->assertEquals( 'editor', $editor->user_login );
-		$this->assertEquals( 'editor@example.org', $editor->user_email );
-		$this->assertEquals( 'FirstName', $editor->user_firstname );
-		$this->assertEquals( 'LastName', $editor->user_lastname );
-		$author = get_user_by( 'login', 'author' );
-		$this->assertEquals( 'author', $author->user_login );
-		$this->assertEquals( 'author@example.org', $author->user_email );
-
-		$this->assertEquals( 30, wp_count_terms( 'category' ) );
-		$this->assertEquals( 3, wp_count_terms( 'post_tag' ) );
-		$foo = get_term_by( 'slug', 'foo', 'category' );
-		$this->assertEquals( 0, $foo->parent );
-		$bar = get_term_by( 'slug', 'bar', 'category' );
-		$foo_bar = get_term_by( 'slug', 'foo-bar', 'category' );
-		$this->assertEquals( $bar->term_id, $foo_bar->parent );
-
-		$post_count = wp_count_posts( 'post' );
-		$this->assertEquals( 5, $post_count->publish );
-		$this->assertEquals( 1, $post_count->private );
-		$page_count = wp_count_posts( 'page' );
-		$this->assertEquals( 4, $page_count->publish );
-		$this->assertEquals( 1, $page_count->draft );
-		$comment_count = wp_count_comments();
-		$this->assertEquals( 1, $comment_count->total_comments );
-	}
-
-	function test_ordering_of_importers() {
-		global $wp_importers;
-		$_wp_importers = $wp_importers; // Preserve global state
-		$wp_importers = array(
-			'xyz1' => array( 'xyz1' ),
-			'XYZ2' => array( 'XYZ2' ),
-			'abc2' => array( 'abc2' ),
-			'ABC1' => array( 'ABC1' ),
-			'def1' => array( 'def1' ),
-		);
-		$this->assertEquals( array(
-			'ABC1' => array( 'ABC1' ),
-			'abc2' => array( 'abc2' ),
-			'def1' => array( 'def1' ),
-			'xyz1' => array( 'xyz1' ),
-			'XYZ2' => array( 'XYZ2' ),
-		), get_importers() );
-		$wp_importers = $_wp_importers; // Restore global state
-	}
-
-	// function test_menu_import
 }