<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15961] trunk: Importer and exporter overhaul, mega props duck.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15961">15961</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-25 20:43:52 +0000 (Mon, 25 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://trac.wordpress.org/ticket/5447">#5447</a> <a href="http://trac.wordpress.org/ticket/5460">#5460</a> <a href="http://trac.wordpress.org/ticket/7400">#7400</a> <a href="http://trac.wordpress.org/ticket/7973">#7973</a> <a href="http://trac.wordpress.org/ticket/8471">#8471</a> <a href="http://trac.wordpress.org/ticket/9237">#9237</a> <a href="http://trac.wordpress.org/ticket/10319">#10319</a> <a href="http://trac.wordpress.org/ticket/11118">#11118</a> <a href="http://trac.wordpress.org/ticket/11144">#11144</a> <a href="http://trac.wordpress.org/ticket/11354">#11354</a> <a href="http://trac.wordpress.org/ticket/11574">#11574</a> <a href="http://trac.wordpress.org/ticket/12685">#12685</a> <a href="http://trac.wordpress.org/ticket/13364">#13364</a> <a href="http://trac.wordpress.org/ticket/13394">#13394</a> <a href="http://trac.wordpress.org/ticket/13453">#13453</a> <a href="http://trac.wordpress.org/ticket/13454">#13454</a> <a href="http://trac.wordpress.org/ticket/13627">#13627</a> <a href="http://trac.wordpress.org/ticket/14306">#14306</a> <a href="http://trac.wordpress.org/ticket/14442">#14442</a> <a href="http://trac.wordpress.org/ticket/14524">#14524</a> <a href="http://trac.wordpress.org/ticket/14750">#14750</a> <a href="http://trac.wordpress.org/ticket/15055">#15055</a> <a href="http://trac.wordpress.org/ticket/15091">#15091</a> <a href="http://trac.wordpress.org/ticket/15108">#15108</a>.
See <a href="http://trac.wordpress.org/ticket/15197">#15197</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesexportphp">trunk/wp-admin/includes/export.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (15960 => 15961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-10-25 14:50:58 UTC (rev 15960)
+++ trunk/wp-admin/export.php 2010-10-25 20:43:52 UTC (rev 15961)
</span><span class="lines">@@ -25,26 +25,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['download'] ) ) {
</span><del>- $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 ) );
</del><ins>+ export_wp();
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,70 +53,6 @@
</span><span class="cx"> <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
</span><span class="cx"> <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p>
</span><span class="cx"> <form action="" method="get">
</span><del>-<h3><?php _e('Filters'); ?></h3>
-
-<table class="form-table">
-<tr>
-<th><label for="mm_start"><?php _e('Start Date'); ?></label></th>
-<td>
-<select name="mm_start" id="mm_start">
- <option value="all" selected="selected"><?php _e('All Dates'); ?></option>
-<?php echo $dateoptions; ?>
-</select>
-</td>
-</tr>
-<tr>
-<th><label for="mm_end" id="mm_end"><?php _e('End Date'); ?></label></th>
-<td>
-<select name="mm_end" id="mm_end">
- <option value="all" selected="selected"><?php _e('All Dates'); ?></option>
-<?php echo $edateoptions; ?>
-</select>
-</td>
-</tr>
-<tr>
-<th><label for="author"><?php _e('Authors'); ?></label></th>
-<td>
-<select name="author" id="author">
-<option value="all" selected="selected"><?php _e('All Authors'); ?></option>
-<?php
-$authors = $wpdb->get_results( "SELECT DISTINCT u.id, u.display_name FROM $wpdb->users u INNER JOIN $wpdb->posts p WHERE u.id = p.post_author ORDER BY u.display_name" );
-foreach ( (array) $authors as $author ) {
- echo "<option value='{$author->id}'>{$author->display_name}</option>\n";
-}
-?>
-</select>
-</td>
-</tr>
-<?php foreach ( get_taxonomies( array( 'show_ui' => true ), 'objects' ) as $tax_obj ) {
- $term_dropdown = wp_dropdown_categories( array( 'taxonomy' => $tax_obj->name, 'hide_if_empty' => true, 'show_option_all' => __( 'All Terms' ), 'name' => 'export_taxonomy[' . $tax_obj->name . ']', 'id' => 'taxonomy-' . $tax_obj->name, 'class' => '', 'echo' => false ) );
- if ( $term_dropdown )
- echo '<tr><th><label for="taxonomy-' . $tax_obj->name . '">' . $tax_obj->labels->name . '</label></th><td>' . $term_dropdown . '</td></tr>';
-}
-?>
-<tr>
-<th><label for="post_type"><?php _e('Content Types'); ?></label></th>
-<td>
-<select name="export_post_type" id="post_type">
- <option value="all" selected="selected"><?php _e('All Content'); ?></option>
- <?php foreach ( get_post_types( array( 'public' => true, 'can_export' => true ), 'objects' ) as $post_type_obj ) { ?>
- <option value="<?php echo $post_type_obj->name; ?>"><?php echo $post_type_obj->labels->name; ?></option>
- <?php } ?>
-</select>
-</td>
-</tr>
-<tr>
-<th><label for="status"><?php _e('Statuses'); ?></label></th>
-<td>
-<select name="export_post_status" id="status">
- <option value="all" selected="selected"><?php _e('All Statuses'); ?></option>
-<?php foreach ( get_post_stati( array( 'internal' => false ), 'objects' ) as $post_status_obj ) { ?>
- <option value="<?php echo $post_status_obj->name; ?>"><?php echo $post_status_obj->label; ?></option>
-<?php } ?>
-</select>
-</td>
-</tr>
-</table>
</del><span class="cx"> <?php submit_button( __('Download Export File'), 'secondary' ); ?>
</span><span class="cx"> <input type="hidden" name="download" value="true" />
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (15960 => 15961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2010-10-25 14:50:58 UTC (rev 15960)
+++ trunk/wp-admin/includes/export.php 2010-10-25 20:43:52 UTC (rev 15961)
</span><span class="lines">@@ -11,127 +11,63 @@
</span><span class="cx"> *
</span><span class="cx"> * Bump this when something changes that might affect compatibility.
</span><span class="cx"> *
</span><del>- * @since unknown
- * @var string
</del><ins>+ * @since 2.5.0
</ins><span class="cx"> */
</span><del>-define('WXR_VERSION', '1.0');
</del><ins>+define( 'WXR_VERSION', '1.1' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Generates the WXR export file for download
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.1.0
</ins><span class="cx"> *
</span><del>- * @param unknown_type $args
</del><ins>+ * @param array $args Filters defining what should be included in the export
</ins><span class="cx"> */
</span><span class="cx"> function export_wp( $args = array() ) {
</span><del>- global $wpdb, $post_ids, $post, $wp_taxonomies;
</del><ins>+ global $wpdb, $post;
</ins><span class="cx">
</span><del>- if ( ! is_array( $args ) )
- $args = array( 'author' => $args );
</del><ins>+ do_action( 'export_wp' );
</ins><span class="cx">
</span><del>- $defaults = array( 'author' => null, 'taxonomy' => null, 'post_type' => null, 'post_status' => null, 'start_date' => null, 'end_date' => null );
- $args = wp_parse_args( $args, $defaults );
</del><ins>+ $sitename = sanitize_key( get_bloginfo( 'name' ) );
+ if ( ! empty($sitename) ) $sitename .= '.';
+ $filename = $sitename . 'wordpress.' . date( 'Y-m-d' ) . '.xml';
</ins><span class="cx">
</span><del>- 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';
-
</del><span class="cx"> header( 'Content-Description: File Transfer' );
</span><span class="cx"> header( 'Content-Disposition: attachment; filename=' . $filename );
</span><span class="cx"> header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
</span><span class="cx">
</span><del>- 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 );
-
</del><span class="cx"> // grab a snapshot of post IDs, just in case it changes during the export
</span><del>- $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
</del><ins>+ $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" );
</ins><span class="cx">
</span><span class="cx"> $categories = (array) get_categories( array( 'get' => 'all' ) );
</span><span class="cx"> $tags = (array) get_tags( array( 'get' => 'all' ) );
</span><span class="cx">
</span><del>- $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' ) );
</del><ins>+ $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
+ $taxonomy_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
</ins><span class="cx">
</span><del>- /**
- * {@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 ) {
</del><ins>+ // put categories in order with no child going before its parent
+ $cats = array();
+ while ( $cat = array_shift( $categories ) ) {
</ins><span class="cx"> if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
</span><span class="cx"> $cats[$cat->term_id] = $cat;
</span><span class="cx"> else
</span><span class="cx"> $categories[] = $cat;
</span><span class="cx"> }
</span><del>- unset( $categories );
</del><span class="cx">
</span><ins>+ // 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;
+ }
+
</ins><span class="cx"> /**
</span><del>- * Place string in CDATA tag.
</del><ins>+ * Wrap given string in XML CDATA tag.
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.1.0
</ins><span class="cx"> *
</span><del>- * @param string $str String to place in XML CDATA tag.
</del><ins>+ * @param string $str String to wrap in XML CDATA tag.
</ins><span class="cx"> */
</span><span class="cx"> function wxr_cdata( $str ) {
</span><span class="cx"> if ( seems_utf8( $str ) == false )
</span><span class="lines">@@ -144,17 +80,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Return the URL of the site
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.5.0
</ins><span class="cx"> *
</span><span class="cx"> * @return string Site URL.
</span><span class="cx"> */
</span><span class="cx"> function wxr_site_url() {
</span><del>- global $current_site;
-
- // mu: the base url
- if ( isset( $current_site->domain ) )
</del><ins>+ // ms: the base url
+ if ( is_multisite() )
</ins><span class="cx"> return network_home_url();
</span><span class="cx"> // wp: the blog url
</span><span class="cx"> else
</span><span class="lines">@@ -162,136 +96,169 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a cat_name XML tag from a given category object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.1.0
</ins><span class="cx"> *
</span><del>- * @param object $c Category Object
</del><ins>+ * @param object $category Category Object
</ins><span class="cx"> */
</span><del>- function wxr_cat_name( $c ) {
- if ( empty( $c->name ) )
</del><ins>+ function wxr_cat_name( $category ) {
+ if ( empty( $category->name ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:cat_name>' . wxr_cdata( $c->name ) . '</wp:cat_name>';
</del><ins>+ echo '<wp:cat_name>' . wxr_cdata( $category->name ) . '</wp:cat_name>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a category_description XML tag from a given category object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.1.0
</ins><span class="cx"> *
</span><del>- * @param object $c Category Object
</del><ins>+ * @param object $category Category Object
</ins><span class="cx"> */
</span><del>- function wxr_category_description( $c ) {
- if ( empty( $c->description ) )
</del><ins>+ function wxr_category_description( $category ) {
+ if ( empty( $category->description ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
</del><ins>+ echo '<wp:category_description>' . wxr_cdata( $category->description ) . '</wp:category_description>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a tag_name XML tag from a given tag object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.3.0
</ins><span class="cx"> *
</span><del>- * @param object $t Tag Object
</del><ins>+ * @param object $tag Tag Object
</ins><span class="cx"> */
</span><del>- function wxr_tag_name( $t ) {
- if ( empty( $t->name ) )
</del><ins>+ function wxr_tag_name( $tag ) {
+ if ( empty( $tag->name ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>';
</del><ins>+ echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . '</wp:tag_name>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a tag_description XML tag from a given tag object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.3.0
</ins><span class="cx"> *
</span><del>- * @param object $t Tag Object
</del><ins>+ * @param object $tag Tag Object
</ins><span class="cx"> */
</span><del>- function wxr_tag_description( $t ) {
- if ( empty( $t->description ) )
</del><ins>+ function wxr_tag_description( $tag ) {
+ if ( empty( $tag->description ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>';
</del><ins>+ echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . '</wp:tag_description>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a term_name XML tag from a given term object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.9.0
</ins><span class="cx"> *
</span><del>- * @param object $t Term Object
</del><ins>+ * @param object $term Term Object
</ins><span class="cx"> */
</span><del>- function wxr_term_name( $t ) {
- if ( empty( $t->name ) )
</del><ins>+ function wxr_term_name( $term ) {
+ if ( empty( $term->name ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:term_name>' . wxr_cdata($t->name) . '</wp:term_name>';
</del><ins>+ echo '<wp:term_name>' . wxr_cdata( $term->name ) . '</wp:term_name>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output a term_description XML tag from a given term object
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.9.0
</ins><span class="cx"> *
</span><del>- * @param object $t Term Object
</del><ins>+ * @param object $term Term Object
</ins><span class="cx"> */
</span><del>- function wxr_term_description( $t ) {
- if ( empty( $t->description ) )
</del><ins>+ function wxr_term_description( $term ) {
+ if ( empty( $term->description ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- echo '<wp:term_description>' . wxr_cdata($t->description) . '</wp:term_description>';
</del><ins>+ echo '<wp:term_description>' . wxr_cdata( $term->description ) . '</wp:term_description>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * {@internal Missing Short Description}}
</del><ins>+ * Output list of authors with posts
</ins><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 3.1.0
</ins><span class="cx"> */
</span><ins>+ 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<wp:author>";
+ echo '<wp:author_login>' . $author->user_login . '</wp:author_login>';
+ echo '<wp:author_email>' . $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->user_firstname ) . '</wp:author_first_name>';
+ echo '<wp:author_last_name>' . wxr_cdata( $author->user_lastname ) . '</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><wp:term_id>{$menu->term_id}</wp:term_id><wp:term_taxonomy>nav_menu</wp:term_taxonomy><wp:term_slug>{$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
+ */
</ins><span class="cx"> function wxr_post_taxonomy() {
</span><span class="cx"> global $post;
</span><span class="cx">
</span><del>- $the_list = '';
- $filter = 'rss';
</del><ins>+ $taxonomies = get_object_taxonomies( $post->post_type );
+ if ( empty( $taxonomies ) )
+ return;
+ $terms = wp_get_object_terms( $post->ID, $taxonomies );
</ins><span class="cx">
</span><del>- $taxonomies = get_object_taxonomies( 'post' );
- $terms = wp_get_post_terms( $post->ID, $taxonomies );
</del><span class="cx"> foreach ( (array) $terms as $term ) {
</span><del>- $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<category><![CDATA[$term_name]]></category>\n";
- elseif ( 'post_tag' == $term->taxonomy )
- $the_list .= "\n\t\t<category domain=\"$domain\"><![CDATA[$term_name]]></category>\n";
- // forwards compatibility as above
- $the_list .= "\n\t\t<category domain=\"$domain\" nicename=\"{$term->slug}\"><![CDATA[$term_name]]></category>\n";
</del><ins>+ echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
</ins><span class="cx"> }
</span><del>- echo $the_list;
</del><span class="cx"> }
</span><span class="cx">
</span><del>- echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
</del><ins>+ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
</ins><span class="cx">
</span><span class="cx"> ?>
</span><del>-<!-- 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. -->
</del><ins>+<!-- 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. -->
</ins><span class="cx"> <!-- You may use this file to transfer that content from one site to another. -->
</span><del>-<!-- This file is not intended to serve as a complete backup of your blog. -->
</del><ins>+<!-- This file is not intended to serve as a complete backup of your site. -->
</ins><span class="cx">
</span><del>-<!-- To import this information into a WordPress blog follow these steps. -->
-<!-- 1. Log in to that blog as an administrator. -->
-<!-- 2. Go to Tools: Import in the blog's admin panels (or Manage: Import in older versions of WordPress). -->
-<!-- 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 -->
</del><ins>+<!-- 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. -->
</ins><span class="cx">
</span><del>-<?php the_generator( 'export' );?>
</del><ins>+<?php the_generator( 'export' ); ?>
</ins><span class="cx"> <rss version="2.0"
</span><span class="cx"> xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
</span><span class="cx"> xmlns:content="http://purl.org/rss/1.0/modules/content/"
</span><span class="lines">@@ -302,29 +269,32 @@
</span><span class="cx">
</span><span class="cx"> <channel>
</span><span class="cx"> <title><?php bloginfo_rss( 'name' ); ?></title>
</span><del>- <link><?php bloginfo_rss( 'url' ) ?></link>
- <description><?php bloginfo_rss( 'description' ) ?></description>
</del><ins>+ <link><?php bloginfo_rss( 'url' ); ?></link>
+ <description><?php bloginfo_rss( 'description' ); ?></description>
</ins><span class="cx"> <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_lastpostmodified( 'GMT' ), false ); ?></pubDate>
</span><del>- <generator>http://wordpress.org/?v=<?php bloginfo_rss( 'version' ); ?></generator>
</del><span class="cx"> <language><?php echo get_option( 'rss_language' ); ?></language>
</span><span class="cx"> <wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
</span><span class="cx"> <wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
</span><span class="cx"> <wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
</span><del>- <?php if ( $cats ) : foreach ( $cats as $c ) : ?>
- <wp:category><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->name : ''; ?></wp:category_parent><?php wxr_cat_name( $c ); ?><?php wxr_category_description( $c ); ?></wp:category>
- <?php endforeach; endif; ?>
- <?php if ( $tags ) : foreach ( $tags as $t ) : ?>
- <wp:tag><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name( $t ); ?><?php wxr_tag_description( $t ); ?></wp:tag>
- <?php endforeach; endif; ?>
- <?php if ( $terms ) : foreach ( $terms as $t ) : ?>
- <wp:term><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $custom_taxonomies[$t->parent]->name : ''; ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
- <?php endforeach; endif; ?>
</del><span class="cx">
</span><ins>+<?php wxr_authors_list(); ?>
+
+<?php foreach ( $cats as $c ) : ?>
+ <wp:category><wp:term_id><?php echo $c->term_id ?></wp:term_id><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->slug : ''; ?></wp:category_parent><?php wxr_cat_name( $c ); ?><?php wxr_category_description( $c ); ?></wp:category>
+<?php endforeach; ?>
+<?php foreach ( $tags as $t ) : ?>
+ <wp:tag><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name( $t ); ?><?php wxr_tag_description( $t ); ?></wp:tag>
+<?php endforeach; ?>
+<?php foreach ( $terms as $t ) : ?>
+ <wp:term><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $terms[$t->parent]->slug : ''; ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
+<?php endforeach; ?>
+<?php wxr_nav_menu_terms(); ?>
+
</ins><span class="cx"> <?php do_action( 'rss2_head' ); ?>
</span><span class="cx">
</span><del>- <?php if ( $post_ids ) {
</del><ins>+<?php if ( $post_ids ) {
</ins><span class="cx"> global $wp_query;
</span><del>- $wp_query->in_the_loop = true; // Fake being in the loop.
</del><ins>+ $wp_query->in_the_loop = true; // Fake being in the loop.
</ins><span class="cx">
</span><span class="cx"> // fetch 20 posts at a time rather than loading the entire table into memory
</span><span class="cx"> while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
</span><span class="lines">@@ -332,21 +302,15 @@
</span><span class="cx"> $posts = $wpdb->get_results( "SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
</span><span class="cx">
</span><span class="cx"> // Begin Loop
</span><del>- foreach ($posts as $post) {
- setup_postdata( $post );
-
- $is_sticky = 0;
- if ( is_sticky( $post->ID ) )
- $is_sticky = 1;
-
- ?>
</del><ins>+ foreach ( $posts as $post ) {
+ setup_postdata( $post );
+ $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+?>
</ins><span class="cx"> <item>
</span><span class="cx"> <title><?php echo apply_filters( 'the_title_rss', $post->post_title ); ?></title>
</span><span class="cx"> <link><?php the_permalink_rss() ?></link>
</span><span class="cx"> <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
</span><del>- <dc:creator><?php echo wxr_cdata( get_the_author() ); ?></dc:creator>
- <?php wxr_post_taxonomy() ?>
-
</del><ins>+ <dc:creator><?php echo get_the_author_meta( 'login' ); ?></dc:creator>
</ins><span class="cx"> <guid isPermaLink="false"><?php esc_url( the_guid() ); ?></guid>
</span><span class="cx"> <description></description>
</span><span class="cx"> <content:encoded><?php echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) ); ?></content:encoded>
</span><span class="lines">@@ -363,41 +327,36 @@
</span><span class="cx"> <wp:post_type><?php echo $post->post_type; ?></wp:post_type>
</span><span class="cx"> <wp:post_password><?php echo $post->post_password; ?></wp:post_password>
</span><span class="cx"> <wp:is_sticky><?php echo $is_sticky; ?></wp:is_sticky>
</span><del>- <?php
- if ( $post->post_type == 'attachment' ) { ?>
</del><ins>+<?php if ( $post->post_type == 'attachment' ) : ?>
</ins><span class="cx"> <wp:attachment_url><?php echo wp_get_attachment_url( $post->ID ); ?></wp:attachment_url>
</span><del>- <?php } ?>
- <?php
- $postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
- if ( $postmeta ) {
- ?>
- <?php foreach( $postmeta as $meta ) { ?>
</del><ins>+<?php endif; ?>
+<?php wxr_post_taxonomy(); ?>
+<?php $postmeta = $wpdb->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' ) : ?>
</ins><span class="cx"> <wp:postmeta>
</span><del>- <wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
- <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
</del><ins>+ <wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
+ <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
</ins><span class="cx"> </wp:postmeta>
</span><del>- <?php } ?>
- <?php } ?>
- <?php
- $comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d", $post->ID ) );
- if ( $comments ) { foreach ( $comments as $c ) { ?>
</del><ins>+<?php endif; endforeach; endif; ?>
+<?php $comments = $wpdb->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 ) : ?>
</ins><span class="cx"> <wp:comment>
</span><del>- <wp:comment_id><?php echo $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 $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 $c->comment_author_IP; ?></wp:comment_author_IP>
- <wp:comment_date><?php echo $c->comment_date; ?></wp:comment_date>
- <wp:comment_date_gmt><?php echo $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 $c->comment_approved; ?></wp:comment_approved>
- <wp:comment_type><?php echo $c->comment_type; ?></wp:comment_type>
- <wp:comment_parent><?php echo $c->comment_parent; ?></wp:comment_parent>
- <wp:comment_user_id><?php echo $c->user_id; ?></wp:comment_user_id>
</del><ins>+ <wp:comment_id><?php echo $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 $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 $c->comment_author_IP; ?></wp:comment_author_IP>
+ <wp:comment_date><?php echo $c->comment_date; ?></wp:comment_date>
+ <wp:comment_date_gmt><?php echo $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 $c->comment_approved; ?></wp:comment_approved>
+ <wp:comment_type><?php echo $c->comment_type; ?></wp:comment_type>
+ <wp:comment_parent><?php echo $c->comment_parent; ?></wp:comment_parent>
+ <wp:comment_user_id><?php echo $c->user_id; ?></wp:comment_user_id>
</ins><span class="cx"> </wp:comment>
</span><del>- <?php } } ?>
</del><ins>+<?php endforeach; endif; ?>
</ins><span class="cx"> </item>
</span><del>- <?php
</del><ins>+<?php
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } ?>
</span><span class="lines">@@ -405,5 +364,3 @@
</span><span class="cx"> </rss>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><del>-
-?>
</del></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15960 => 15961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-10-25 14:50:58 UTC (rev 15960)
+++ trunk/wp-includes/general-template.php 2010-10-25 20:43:52 UTC (rev 15961)
</span><span class="lines">@@ -2229,7 +2229,7 @@
</span><span class="cx"> $gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
</span><span class="cx"> break;
</span><span class="cx"> case 'export':
</span><del>- $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '"-->';
</del><ins>+ $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> return apply_filters( "get_the_generator_{$type}", $gen, $type );
</span></span></pre>
</div>
</div>
</body>
</html>