From ee1ba7f2f343dd99921162df1c3184e7423102d6 Mon Sep 17 00:00:00 2001
From: nacin
Date: Mon, 25 Oct 2010 20:43:52 +0000
Subject: [PATCH] Importer and exporter overhaul, mega props duck.
Exporter overhaul:
* Add author information to export
* Greater usage of slug identifiers
* Don't export auto-drafts, spam comments, or edit lock/last meta keys
* Inline documentation improvements
* Remove filtering for now (@todo)
* Bump WXR version to 1.1, but remain back compat in the importer
Importer overhaul (http://plugins.trac.wordpress.org/changeset/304249):
* Use an XML parser where available (SimpleXML, XML Parser)
* Proper import support for navigation menus
* Many bug fixes, specifically improvements to category and custom taxonomy handling
* Better author/user mapping
Fixes #5447 #5460 #7400 #7973 #8471 #9237 #10319 #11118 #11144 #11354 #11574 #12685 #13364 #13394 #13453 #13454 #13627 #14306 #14442 #14524 #14750 #15055 #15091 #15108.
See #15197.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15961 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/export.php | 85 +------
wp-admin/includes/export.php | 399 ++++++++++++++-----------------
wp-includes/general-template.php | 2 +-
3 files changed, 180 insertions(+), 306 deletions(-)
diff --git a/wp-admin/export.php b/wp-admin/export.php
index d64876b75..492b4394f 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -25,26 +25,7 @@ add_contextual_help($current_screen,
);
if ( isset( $_GET['download'] ) ) {
- $author = isset($_GET['author']) ? $_GET['author'] : 'all';
- $taxonomy = array();
- foreach ( get_taxonomies( array( 'show_ui' => true ) ) as $tax )
- $taxonomy[ $tax ] = ! empty( $_GET['export_taxonomy'][ $tax ] ) ? $_GET['export_taxonomy'][ $tax ] : 'all';
- $post_type = isset($_GET['export_post_type']) ? stripslashes_deep($_GET['export_post_type']) : 'all';
- $status = isset($_GET['export_post_status']) ? stripslashes_deep($_GET['export_post_status']) : 'all';
- $mm_start = isset($_GET['mm_start']) ? $_GET['mm_start'] : 'all';
- $mm_end = isset($_GET['mm_end']) ? $_GET['mm_end'] : 'all';
- if( $mm_start != 'all' ) {
- $start_date = sprintf( "%04d-%02d-%02d", substr( $mm_start, 0, 4 ), substr( $mm_start, 5, 2 ), 1 );
- } else {
- $start_date = 'all';
- }
- if( $mm_end != 'all' ) {
- $end_date = sprintf( "%04d-%02d-%02d", substr( $mm_end, 0, 4 ), substr( $mm_end, 5, 2 ), 1 );
- } else {
- $end_date = 'all';
- }
-
- export_wp( array( 'author' => $author, 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'post_status' => $status, 'start_date' => $start_date, 'end_date' => $end_date ) );
+ export_wp();
die();
}
@@ -72,70 +53,6 @@ if ( $monthyears = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`
diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index a9e8f22db..afa34da90 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -11,127 +11,63 @@
*
* Bump this when something changes that might affect compatibility.
*
- * @since unknown
- * @var string
+ * @since 2.5.0
*/
-define('WXR_VERSION', '1.0');
+define( 'WXR_VERSION', '1.1' );
/**
- * {@internal Missing Short Description}}
+ * Generates the WXR export file for download
*
- * @since unknown
+ * @since 2.1.0
*
- * @param unknown_type $args
+ * @param array $args Filters defining what should be included in the export
*/
function export_wp( $args = array() ) {
- global $wpdb, $post_ids, $post, $wp_taxonomies;
+ global $wpdb, $post;
- if ( ! is_array( $args ) )
- $args = array( 'author' => $args );
+ do_action( 'export_wp' );
- $defaults = array( 'author' => null, 'taxonomy' => null, 'post_type' => null, 'post_status' => null, 'start_date' => null, 'end_date' => null );
- $args = wp_parse_args( $args, $defaults );
-
- extract($args);
-
- do_action('export_wp');
-
- if( strlen( $start_date ) > 4 && strlen( $end_date ) > 4 )
- $filename = 'wordpress.' . $start_date . '.' . $end_date . '.xml';
- else
- $filename = 'wordpress.' . date( 'Y-m-d' ) . '.xml';
+ $sitename = sanitize_key( get_bloginfo( 'name' ) );
+ if ( ! empty($sitename) ) $sitename .= '.';
+ $filename = $sitename . 'wordpress.' . date( 'Y-m-d' ) . '.xml';
header( 'Content-Description: File Transfer' );
header( 'Content-Disposition: attachment; filename=' . $filename );
header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
- if ( $post_type && $post_type != 'all' )
- $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
- else
- $where = "WHERE post_type != 'revision' ";
-
- if ( $author && $author != 'all' ) {
- $author_id = (int) $author;
- $where .= $wpdb->prepare( "AND post_author = %d ", $author_id );
- }
-
- if ( $start_date && $start_date != 'all' )
- $where .= $wpdb->prepare( "AND post_date >= %s ", $start_date );
-
- if ( $end_date && $end_date != 'all' )
- $where .= $wpdb->prepare( "AND post_date < %s ", $end_date );
-
- if ( $taxonomy && is_array( $taxonomy ) ) {
- foreach ( $taxonomy as $term_id ) {
- if ( $term_id != 'all' )
- $where .= $wpdb->prepare( "AND ID IN (SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d) ", $term_id );
- }
- }
-
- if ( $post_status && $post_status != 'all' )
- $where .= $wpdb->prepare( "AND post_status = %s", $post_status );
-
// grab a snapshot of post IDs, just in case it changes during the export
- $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
+ $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type != 'revision' AND post_status != 'auto-draft' ORDER BY post_date_gmt ASC" );
$categories = (array) get_categories( array( 'get' => 'all' ) );
$tags = (array) get_tags( array( 'get' => 'all' ) );
- $custom_taxonomies = $wp_taxonomies;
- unset( $custom_taxonomies['category'] );
- unset( $custom_taxonomies['post_tag'] );
- unset( $custom_taxonomies['link_category'] );
- $custom_taxonomies = array_keys( $custom_taxonomies );
- $terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+ $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
+ $taxonomy_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
- /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param unknown_type $categories
- */
- function wxr_missing_parents( $categories ) {
- if ( ! is_array( $categories ) || empty( $categories ) )
- return array();
-
- foreach ( $categories as $category ){
- $parents[$category->term_id] = $category->parent;
- }
-
- $parents = array_unique( array_diff( $parents, array_keys( $parents ) ) );
-
- if ( $zero = array_search( '0', $parents ) )
- unset( $parents[$zero] );
-
- return $parents;
- }
-
- while ( $parents = wxr_missing_parents( $categories ) ) {
- $found_parents = get_categories( array( 'include' => join( ', ', $parents) ) );
- if ( is_array( $found_parents ) && count( $found_parents ) )
- $categories = array_merge( $categories, $found_parents );
- else
- break;
- }
-
- // Put them in order to be inserted with no child going before its parent
- $pass = 0;
- $passes = 1000 + count( $categories );
- while ( ( $cat = array_shift( $categories ) ) && ++$pass < $passes ) {
+ // put categories in order with no child going before its parent
+ $cats = array();
+ while ( $cat = array_shift( $categories ) ) {
if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
$cats[$cat->term_id] = $cat;
else
$categories[] = $cat;
}
- unset( $categories );
+
+ // put terms in order with no child going before its parent
+ $terms = array();
+ while ( $t = array_shift( $taxonomy_terms ) ) {
+ if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
+ $terms[$t->term_id] = $t;
+ else
+ $taxonomy_terms[] = $t;
+ }
/**
- * Place string in CDATA tag.
+ * Wrap given string in XML CDATA tag.
*
- * @since unknown
+ * @since 2.1.0
*
- * @param string $str String to place in XML CDATA tag.
+ * @param string $str String to wrap in XML CDATA tag.
*/
function wxr_cdata( $str ) {
if ( seems_utf8( $str ) == false )
@@ -144,17 +80,15 @@ function export_wp( $args = array() ) {
}
/**
- * {@internal Missing Short Description}}
+ * Return the URL of the site
*
- * @since unknown
+ * @since 2.5.0
*
* @return string Site URL.
*/
function wxr_site_url() {
- global $current_site;
-
- // mu: the base url
- if ( isset( $current_site->domain ) )
+ // ms: the base url
+ if ( is_multisite() )
return network_home_url();
// wp: the blog url
else
@@ -162,136 +96,169 @@ function export_wp( $args = array() ) {
}
/**
- * {@internal Missing Short Description}}
+ * Output a cat_name XML tag from a given category object
*
- * @since unknown
+ * @since 2.1.0
*
- * @param object $c Category Object
+ * @param object $category Category Object
*/
- function wxr_cat_name( $c ) {
- if ( empty( $c->name ) )
+ function wxr_cat_name( $category ) {
+ if ( empty( $category->name ) )
return;
- echo '' . wxr_cdata( $c->name ) . '';
+ echo '' . wxr_cdata( $category->name ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output a category_description XML tag from a given category object
*
- * @since unknown
+ * @since 2.1.0
*
- * @param object $c Category Object
+ * @param object $category Category Object
*/
- function wxr_category_description( $c ) {
- if ( empty( $c->description ) )
+ function wxr_category_description( $category ) {
+ if ( empty( $category->description ) )
return;
- echo '' . wxr_cdata($c->description) . '';
+ echo '' . wxr_cdata( $category->description ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output a tag_name XML tag from a given tag object
*
- * @since unknown
+ * @since 2.3.0
*
- * @param object $t Tag Object
+ * @param object $tag Tag Object
*/
- function wxr_tag_name( $t ) {
- if ( empty( $t->name ) )
+ function wxr_tag_name( $tag ) {
+ if ( empty( $tag->name ) )
return;
- echo '' . wxr_cdata($t->name) . '';
+ echo '' . wxr_cdata( $tag->name ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output a tag_description XML tag from a given tag object
*
- * @since unknown
+ * @since 2.3.0
*
- * @param object $t Tag Object
+ * @param object $tag Tag Object
*/
- function wxr_tag_description( $t ) {
- if ( empty( $t->description ) )
+ function wxr_tag_description( $tag ) {
+ if ( empty( $tag->description ) )
return;
- echo '' . wxr_cdata($t->description) . '';
+ echo '' . wxr_cdata( $tag->description ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output a term_name XML tag from a given term object
*
- * @since unknown
+ * @since 2.9.0
*
- * @param object $t Term Object
+ * @param object $term Term Object
*/
- function wxr_term_name( $t ) {
- if ( empty( $t->name ) )
+ function wxr_term_name( $term ) {
+ if ( empty( $term->name ) )
return;
- echo '' . wxr_cdata($t->name) . '';
+ echo '' . wxr_cdata( $term->name ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output a term_description XML tag from a given term object
*
- * @since unknown
+ * @since 2.9.0
*
- * @param object $t Term Object
+ * @param object $term Term Object
*/
- function wxr_term_description( $t ) {
- if ( empty( $t->description ) )
+ function wxr_term_description( $term ) {
+ if ( empty( $term->description ) )
return;
- echo '' . wxr_cdata($t->description) . '';
+ echo '' . wxr_cdata( $term->description ) . '';
}
/**
- * {@internal Missing Short Description}}
+ * Output list of authors with posts
*
- * @since unknown
+ * @since 3.1.0
+ */
+ function wxr_authors_list() {
+ global $wpdb;
+
+ $authors = array();
+ $results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts" );
+ foreach ( (array) $results as $result )
+ $authors[] = get_userdata( $result->post_author );
+
+ foreach( $authors as $author ) {
+ echo "\t";
+ echo '' . $author->user_login . '';
+ echo '' . $author->user_email . '';
+ echo '' . wxr_cdata( $author->display_name ) . '';
+ echo '' . wxr_cdata( $author->user_firstname ) . '';
+ echo '' . wxr_cdata( $author->user_lastname ) . '';
+ echo "\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{$menu->term_id}nav_menu{$menu->slug}";
+ wxr_term_name( $menu );
+ echo "\n";
+ }
+ }
+
+ /**
+ * Output list of taxonomy terms, in XML tag format, associated with a post
+ *
+ * @since 2.3.0
*/
function wxr_post_taxonomy() {
global $post;
- $the_list = '';
- $filter = 'rss';
+ $taxonomies = get_object_taxonomies( $post->post_type );
+ if ( empty( $taxonomies ) )
+ return;
+ $terms = wp_get_object_terms( $post->ID, $taxonomies );
- $taxonomies = get_object_taxonomies( 'post' );
- $terms = wp_get_post_terms( $post->ID, $taxonomies );
foreach ( (array) $terms as $term ) {
- $domain = ( 'post_tag' == $term->taxonomy ) ? 'tag' : $term->taxonomy;
- $term_name = sanitize_term_field( 'name', $term->name, $term->term_id, $term->taxonomy, $filter );
- // Back compat.
- if ( 'category' == $term->taxonomy )
- $the_list .= "\n\t\t\n";
- elseif ( 'post_tag' == $term->taxonomy )
- $the_list .= "\n\t\t\n";
- // forwards compatibility as above
- $the_list .= "\n\t\tslug}\">\n";
+ echo "\t\ttaxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "\n";
}
- echo $the_list;
}
- echo '\n";
+ echo '\n";
?>
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
- http://wordpress.org/?v=
-
- slug; ?>parent ? $cats[$c->parent]->name : ''; ?>
-
-
- slug; ?>
-
-
- taxonomy; ?>slug; ?>parent ? $custom_taxonomies[$t->parent]->name : ''; ?>
-
+
+
+
+
+ term_id ?>slug; ?>parent ? $cats[$c->parent]->slug : ''; ?>
+
+
+ term_id ?>slug; ?>
+
+
+ term_id ?>taxonomy; ?>slug; ?>parent ? $terms[$t->parent]->slug : ''; ?>
+
+
- in_the_loop = true; // Fake being in the loop.
+ $wp_query->in_the_loop = true; // Fake being in the loop.
// fetch 20 posts at a time rather than loading the entire table into memory
while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
@@ -332,21 +302,15 @@ function export_wp( $args = array() ) {
$posts = $wpdb->get_results( "SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
// Begin Loop
- foreach ($posts as $post) {
- setup_postdata( $post );
-
- $is_sticky = 0;
- if ( is_sticky( $post->ID ) )
- $is_sticky = 1;
-
- ?>
+ foreach ( $posts as $post ) {
+ setup_postdata( $post );
+ $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+?>
-
post_title ); ?>
-
-
-
+
post_content ) ); ?>
@@ -363,41 +327,36 @@ function export_wp( $args = array() ) {
post_type; ?>
post_password; ?>
- post_type == 'attachment' ) { ?>
+post_type == 'attachment' ) : ?>
ID ); ?>
-
- get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
- if ( $postmeta ) {
- ?>
-
+
+
+get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
+ if ( $postmeta ) : foreach( $postmeta as $meta ) : if ( $meta->meta_key != '_edit_lock' && $meta->meta_key != '_edit_last' ) : ?>
- meta_key; ?>
- meta_value ); ?>
+ meta_key; ?>
+ meta_value ); ?>
-
-
- get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d", $post->ID ) );
- if ( $comments ) { foreach ( $comments as $c ) { ?>
+
+get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
+ if ( $comments ) : foreach ( $comments as $c ) : ?>
- comment_ID; ?>
- comment_author ); ?>
- comment_author_email; ?>
- comment_author_url ); ?>
- comment_author_IP; ?>
- comment_date; ?>
- comment_date_gmt; ?>
- comment_content ) ?>
- comment_approved; ?>
- comment_type; ?>
- comment_parent; ?>
- user_id; ?>
+ comment_ID; ?>
+ comment_author ); ?>
+ comment_author_email; ?>
+ comment_author_url ); ?>
+ comment_author_IP; ?>
+ comment_date; ?>
+ comment_date_gmt; ?>
+ comment_content ) ?>
+ comment_approved; ?>
+ comment_type; ?>
+ comment_parent; ?>
+ user_id; ?>
-
+
-
@@ -405,5 +364,3 @@ function export_wp( $args = array() ) {
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index a20c6d511..d6782e746 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2229,7 +2229,7 @@ function get_the_generator( $type = '' ) {
$gen = '';
break;
case 'export':
- $gen = '';
+ $gen = '';
break;
}
return apply_filters( "get_the_generator_{$type}", $gen, $type );