WP Merge to 4524

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

1 files changed, 47 insertions, 8 deletions

diff --git a/wp-admin/export.php b/wp-admin/export.php
index f50b8e0..8f740fc 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -15,6 +15,25 @@ require_once ('admin-header.php');
 <p><?php _e('When you click the button below WordPress will create a XML file for you to save to your computer.'); ?></p>

 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, comments, custom fields, and categories.'); ?></p>

 <form action="" method="get">

+<h3><?php _e('Optional options'); ?></h3>

+

+<table>

+<tr>

+<th><?php _e('Restrict Author:'); ?></th>

+<td>

+<select name="author">

+<option value="all" selected="selected"><?php _e('All'); ?></option>

+<?php

+$authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );  

+foreach ( $authors as $id ) {

+	$o = get_userdata( $id );

+	echo "<option value='$o->ID'>$o->display_name</option>";

+}

+?>

+</select>

+</td>

+</tr>

+</table>

 <p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?> &raquo;" />

 <input type="hidden" name="download" value="true" />

 </p>

@@ -26,17 +45,35 @@ require_once ('admin-header.php');
 <?php

 

 function export_wp() {

-	global $wpdb, $posts, $post;

-	$filename = 'wordpress.' . date('Y-m-d') . '.xml';

+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/xml; charset=' . get_option('blog_charset'), true);

-//$posts = query_posts('');

-$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC");

+header('Content-type: text/wxr+xml; charset=' . get_option('blog_charset'), true);

+

+$where = '';

+if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {

+	$author_id = (int) $_GET['author'];

+	$where = " WHERE post_author = '$author_id' ";

+}

+

+$posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");

 ?>

+<!-- 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. -->

+

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

-<rss version="2.0" 

+<rss version="2.0"

 	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/"

@@ -62,6 +99,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A
 <guid isPermaLink="false"><?php the_guid(); ?></guid>

 <description></description>

 <content:encoded><![CDATA[<?php echo $post->post_content ?>]]></content:encoded>

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

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

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

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

@@ -71,7 +109,7 @@ $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt A
 <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>

 <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"); 

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

 if ( $postmeta ) {

 ?>

 <?php foreach( $postmeta as $meta ) { ?>

@@ -82,9 +120,10 @@ if ( $postmeta ) {
 <?php } ?>

 <?php } ?>

 <?php

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

+$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID");

 if ( $comments ) { foreach ( $comments as $c ) { ?>

 <wp:comment>

+<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>

 <wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author>

 <wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email>

 <wp:comment_author_url><?php echo $c->comment_author_url; ?></wp:comment_author_url>