<!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>[14444] trunk/wp-admin: export improvements, props blepoxp, see #10317</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14444">14444</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-04 17:31:36 +0000 (Tue, 04 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>export improvements, props blepoxp, see <a href="http://trac.wordpress.org/ticket/10317">#10317</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (14443 => 14444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-05-04 17:13:11 UTC (rev 14443)
+++ trunk/wp-admin/export.php 2010-05-04 17:31:36 UTC (rev 14444)
</span><span class="lines">@@ -18,41 +18,39 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['download'] ) ) {
</span><span class="cx"> $author = isset($_GET['author']) ? $_GET['author'] : 'all';
</span><del>- $category = isset($_GET['category']) ? $_GET['category'] : 'all';
</del><ins>+ $taxonomy = array();
+ foreach ( get_taxonomies( array( 'show_ui' => true ) ) as $tax )
+ $taxonomy[ $tax ] = ! empty( $_GET['taxonomy'][ $tax ] ) ? $_GET['taxonomy'][ $tax ] : 'all';
</ins><span class="cx"> $post_type = isset($_GET['post_type']) ? stripslashes_deep($_GET['post_type']) : 'all';
</span><span class="cx"> $status = isset($_GET['status']) ? stripslashes_deep($_GET['status']) : 'all';
</span><span class="cx"> $mm_start = isset($_GET['mm_start']) ? $_GET['mm_start'] : 'all';
</span><span class="cx"> $mm_end = isset($_GET['mm_end']) ? $_GET['mm_end'] : 'all';
</span><del>- $aa_start = isset($_GET['aa_start']) ? intval($_GET['aa_start']) : 0;
- $aa_end = isset($_GET['aa_end']) ? intval($_GET['aa_end']) : 0;
- if($mm_start != 'all' && $aa_start > 0) {
- $start_date = sprintf( "%04d-%02d-%02d", $aa_start, $mm_start, 1 );
</del><ins>+ if( $mm_start != 'all' ) {
+ $start_date = sprintf( "%04d-%02d-%02d", substr( $mm_start, 0, 4 ), substr( $mm_start, 5, 2 ), 1 );
</ins><span class="cx"> } else {
</span><span class="cx"> $start_date = 'all';
</span><span class="cx"> }
</span><del>- if($mm_end != 'all' && $aa_end > 0) {
- if($mm_end == 12) {
- $mm_end = 1;
- $aa_end++;
- } else {
- $mm_end++;
- }
- $end_date = sprintf( "%04d-%02d-%02d", $aa_end, $mm_end, 1 );
</del><ins>+ if( $mm_end != 'all' ) {
+ $end_date = sprintf( "%04d-%02d-%02d", substr( $mm_end, 0, 4 ), substr( $mm_end, 5, 2 ), 1 );
</ins><span class="cx"> } else {
</span><span class="cx"> $end_date = 'all';
</span><span class="cx"> }
</span><del>- export_wp( $author, $category, $post_type, $status, $start_date, $end_date );
</del><ins>+
+ export_wp( array( 'author' => $author, 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'post_status' => $status, 'start_date' => $start_date, 'end_date' => $end_date ) );
</ins><span class="cx"> die();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> require_once ('admin-header.php');
</span><span class="cx">
</span><del>-$months = "";
-for ( $i = 1; $i < 13; $i++ ) {
- $months .= "\t\t\t<option value=\"" . zeroise($i, 2) . '">' .
- $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) ) . "</option>\n";
-} ?>
</del><ins>+$dateoptions = '';
+if ( $monthyears = $wpdb->get_results( "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC " ) ) {
+ foreach ( $monthyears as $monthyear ) {
+ $dateoptions .= "\t<option value=\"" . $monthyear->year . '-' . zeroise( $monthyear->month, 2 ) . '">' . $wp_locale->get_month( $monthyear->month ) . ' ' . $monthyear->year . "</option>\n";
+ }
+}
</ins><span class="cx">
</span><ins>+?>
+
</ins><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="lines">@@ -66,19 +64,16 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="mm_start"><?php _e('Restrict Date'); ?></label></th>
</span><del>-<td><strong><?php _e('Start:'); ?></strong> <?php _e('Month'); ?>&nbsp;
</del><ins>+<td><strong><?php _e('Start:'); ?></strong>
</ins><span class="cx"> <select name="mm_start" id="mm_start">
</span><del>-<option value="all" selected="selected"><?php _e('All Dates'); ?></option>
-<?php echo $months; ?>
-</select>&nbsp;<?php _e('Year'); ?>&nbsp;
-<input type="text" id="aa_start" name="aa_start" value="" size="4" maxlength="5" />
-</td>
-<td><strong><?php _e('End:'); ?></strong> <?php _e('Month'); ?>&nbsp;
</del><ins>+ <option value="all" selected="selected"><?php _e('All Dates'); ?></option>
+<?php echo ($dateoptions); ?>
+</select> <br/>
+<strong><?php _e('End:'); ?></strong>
</ins><span class="cx"> <select name="mm_end" id="mm_end">
</span><del>-<option value="all" selected="selected"><?php _e('All Dates'); ?></option>
-<?php echo $months; ?>
-</select>&nbsp;<?php _e('Year'); ?>&nbsp;
-<input type="text" id="aa_end" name="aa_end" value="" size="4" maxlength="5" />
</del><ins>+ <option value="all" selected="selected"><?php _e('All Dates'); ?></option>
+<?php echo $dateoptions; ?>
+</select>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -87,36 +82,33 @@
</span><span class="cx"> <select name="author" id="author">
</span><span class="cx"> <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
</span><span class="cx"> <?php
</span><del>-$authors = $wpdb->get_results( "SELECT DISTINCT u.id, u.display_name FROM $wpdb->users u INNER JOIN $wpdb->posts p ON 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";
</del><ins>+$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";
+}
</ins><span class="cx"> ?>
</span><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><del>-<th><label for="category"><?php _e('Restrict Category'); ?></label></th>
</del><ins>+<th><?php _e('Restrict Taxonomies'); ?></th>
</ins><span class="cx"> <td>
</span><del>-<select name="category" id="category">
-<option value="all" selected="selected"><?php _e('All Categories'); ?></option>
-<?php
-$categories = (array) get_categories('get=all');
-if($categories) {
- foreach ( $categories as $cat ) {
- echo "<option value='{$cat->term_taxonomy_id}'>{$cat->name}</option>\n";
- }
</del><ins>+<?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' => 'taxonomy[' . $tax_obj->name . ']', 'id' => 'taxonomy-' . $tax_obj->name, 'class' => '', 'echo' => false ) );
+ if ( $term_dropdown )
+ echo '<label for="taxonomy-' . $tax_obj->name . '">' . $tax_obj->label . '</label>: ' . $term_dropdown . '<br/>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-</select>
</del><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="post_type"><?php _e('Restrict Content'); ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <select name="post_type" id="post_type">
</span><del>-<option value="all" selected="selected"><?php _e('All Content'); ?></option>
-<option value="page"><?php _e('Pages'); ?></option>
-<option value="post"><?php _e('Posts'); ?></option>
</del><ins>+ <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->label; ?></option>
+ <?php } ?>
</ins><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -124,11 +116,10 @@
</span><span class="cx"> <th><label for="status"><?php _e('Restrict Status'); ?></label></th>
</span><span class="cx"> <td>
</span><span class="cx"> <select name="status" id="status">
</span><del>-<option value="all" selected="selected"><?php _e('All Statuses'); ?></option>
-<option value="draft"><?php _e('Draft'); ?></option>
-<option value="private"><?php _e('Privately published'); ?></option>
-<option value="publish"><?php _e('Published'); ?></option>
-<option value="future"><?php _e('Scheduled'); ?></option>
</del><ins>+ <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 } ?>
</ins><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/export.php (14443 => 14444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/export.php 2010-05-04 17:13:11 UTC (rev 14443)
+++ trunk/wp-admin/includes/export.php 2010-05-04 17:31:36 UTC (rev 14444)
</span><span class="lines">@@ -21,253 +21,260 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- * @param unknown_type $author
</del><ins>+ * @param unknown_type $args
</ins><span class="cx"> */
</span><del>-function export_wp($author='', $category='', $post_type='', $status='', $start_date='', $end_date='') {
-global $wpdb, $post_ids, $post, $wp_taxonomies;
-
-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';
-}
-
-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 and $post_type != 'all' ) {
</del><ins>+function export_wp( $args = array() ) {
+ global $wpdb, $post_ids, $post, $wp_taxonomies;
+
+ if ( ! is_array( $args ) )
+ $args = array( 'author' => $args );
+
+ $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';
+
+ 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' )
</ins><span class="cx"> $where = $wpdb->prepare("WHERE post_type = %s ", $post_type);
</span><del>-} else {
</del><ins>+ else
</ins><span class="cx"> $where = "WHERE post_type != 'revision' ";
</span><del>-}
-if ( $author and $author != 'all' ) {
</del><ins>+
+ if ( $author && $author != 'all' ) {
</ins><span class="cx"> $author_id = (int) $author;
</span><del>- $where .= $wpdb->prepare("AND post_author = %d ", $author_id);
-}
-if ( $start_date and $start_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date >= %s ", $start_date);
-}
-if ( $end_date and $end_date != 'all' ) {
- $where .= $wpdb->prepare("AND post_date < %s ", $end_date);
-}
-if ( $category and $category != 'all' ) {
- $taxomony_id = (int) $category;
- $where .= $wpdb->prepare("AND ID IN (SELECT object_id FROM {$wpdb->term_relationships} " . "WHERE term_taxonomy_id = %d) ", $taxomony_id);
-}
-if ( $status and $status != 'all' ) {
- $where .= $wpdb->prepare("AND post_status = %s ", $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");
-
-$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'));
-
-/**
- * {@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 ) {
- if ( $cat->parent == 0 || isset($cats[$cat->parent]) ) {
- $cats[$cat->term_id] = $cat;
- } else {
- $categories[] = $cat;
</del><ins>+ $where .= $wpdb->prepare( "AND post_author = %d ", $author_id );
</ins><span class="cx"> }
</span><del>-}
-unset($categories);
-
-/**
- * Place string in CDATA tag.
- *
- * @since unknown
- *
- * @param string $str String to place in XML CDATA tag.
- */
-function wxr_cdata($str) {
- if ( seems_utf8($str) == false )
- $str = utf8_encode($str);
-
- // $str = ent2ncr(esc_html($str));
-
- $str = "<![CDATA[$str" . ( ( substr($str, -1) == ']' ) ? ' ' : '') . "]]>";
-
- return $str;
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @return string Site URL.
- */
-function wxr_site_url() {
- global $current_site;
-
- // mu: the base url
- if ( isset($current_site->domain) ) {
- return 'http://'.$current_site->domain.$current_site->path;
</del><ins>+
+ 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 );
+ }
</ins><span class="cx"> }
</span><del>- // wp: the blog url
- else {
- return get_bloginfo_rss('url');
</del><ins>+
+ if ( $post_status && $post_status != 'all' )
+ $where .= $wpdb->prepare( "AND post_status = %s", $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" );
+
+ $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' ) );
+
+ /**
+ * {@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;
</ins><span class="cx"> }
</span><del>-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $c Category Object
- */
-function wxr_cat_name($c) {
- if ( empty($c->name) )
- return;
-
- echo '<wp:cat_name>' . wxr_cdata($c->name) . '</wp:cat_name>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $c Category Object
- */
-function wxr_category_description($c) {
- if ( empty($c->description) )
- return;
-
- echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $t Tag Object
- */
-function wxr_tag_name($t) {
- if ( empty($t->name) )
- return;
-
- echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $t Tag Object
- */
-function wxr_tag_description($t) {
- if ( empty($t->description) )
- return;
-
- echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $t Term Object
- */
-function wxr_term_name($t) {
- if ( empty($t->name) )
- return;
-
- echo '<wp:term_name>' . wxr_cdata($t->name) . '</wp:term_name>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param object $t Term Object
- */
-function wxr_term_description($t) {
- if ( empty($t->description) )
- return;
-
- echo '<wp:term_description>' . wxr_cdata($t->description) . '</wp:term_description>';
-}
-
-/**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- */
-function wxr_post_taxonomy() {
- global $post;
-
- $the_list = '';
- $filter = 'rss';
-
- $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<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>+
+ 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;
</ins><span class="cx"> }
</span><del>- echo $the_list;
-}
-
-echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
-
-?>
</del><ins>+
+ // 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 ) {
+ if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
+ $cats[$cat->term_id] = $cat;
+ else
+ $categories[] = $cat;
+ }
+ unset( $categories );
+
+ /**
+ * Place string in CDATA tag.
+ *
+ * @since unknown
+ *
+ * @param string $str String to place in XML CDATA tag.
+ */
+ function wxr_cdata( $str ) {
+ if ( seems_utf8( $str ) == false )
+ $str = utf8_encode( $str );
+
+ // $str = ent2ncr(esc_html($str));
+ $str = "<![CDATA[$str" . ( ( substr( $str, -1 ) == ']' ) ? ' ' : '') . "]]>";
+
+ return $str;
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @return string Site URL.
+ */
+ function wxr_site_url() {
+ global $current_site;
+
+ // mu: the base url
+ if ( isset( $current_site->domain ) )
+ return 'http://' . $current_site->domain . $current_site->path;
+ // wp: the blog url
+ else
+ return get_bloginfo_rss( 'url' );
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $c Category Object
+ */
+ function wxr_cat_name( $c ) {
+ if ( empty( $c->name ) )
+ return;
+
+ echo '<wp:cat_name>' . wxr_cdata( $c->name ) . '</wp:cat_name>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $c Category Object
+ */
+ function wxr_category_description( $c ) {
+ if ( empty( $c->description ) )
+ return;
+
+ echo '<wp:category_description>' . wxr_cdata($c->description) . '</wp:category_description>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $t Tag Object
+ */
+ function wxr_tag_name( $t ) {
+ if ( empty( $t->name ) )
+ return;
+
+ echo '<wp:tag_name>' . wxr_cdata($t->name) . '</wp:tag_name>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $t Tag Object
+ */
+ function wxr_tag_description( $t ) {
+ if ( empty( $t->description ) )
+ return;
+
+ echo '<wp:tag_description>' . wxr_cdata($t->description) . '</wp:tag_description>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $t Term Object
+ */
+ function wxr_term_name( $t ) {
+ if ( empty( $t->name ) )
+ return;
+
+ echo '<wp:term_name>' . wxr_cdata($t->name) . '</wp:term_name>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ *
+ * @param object $t Term Object
+ */
+ function wxr_term_description( $t ) {
+ if ( empty( $t->description ) )
+ return;
+
+ echo '<wp:term_description>' . wxr_cdata($t->description) . '</wp:term_description>';
+ }
+
+ /**
+ * {@internal Missing Short Description}}
+ *
+ * @since unknown
+ */
+ function wxr_post_taxonomy() {
+ global $post;
+
+ $the_list = '';
+ $filter = 'rss';
+
+ $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<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";
+ }
+ echo $the_list;
+ }
+
+ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?' . ">\n";
+
+ ?>
</ins><span class="cx"> <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your blog. -->
</span><span class="cx"> <!-- It contains information about your blog's posts, comments, and categories. -->
</span><span class="cx"> <!-- You may use this file to transfer that content from one site to another. -->
</span><span class="lines">@@ -284,7 +291,7 @@
</span><span class="cx"> <!-- 6. WordPress will then import each of the posts, comments, and categories -->
</span><span class="cx"> <!-- contained in this file into your blog -->
</span><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">@@ -294,98 +301,106 @@
</span><span class="cx"> >
</span><span class="cx">
</span><span class="cx"> <channel>
</span><del>- <title><?php bloginfo_rss('name'); ?></title>
- <link><?php bloginfo_rss('url') ?></link>
- <description><?php bloginfo_rss("description") ?></description>
- <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate>
- <generator>http://wordpress.org/?v=<?php bloginfo_rss('version'); ?></generator>
- <language><?php echo get_option('rss_language'); ?></language>
</del><ins>+ <title><?php bloginfo_rss( 'name' ); ?></title>
+ <link><?php bloginfo_rss( 'url' ) ?></link>
+ <description><?php bloginfo_rss( 'description' ) ?></description>
+ <pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_lastpostmodified( 'GMT' ), false ); ?></pubDate>
+ <generator>http://wordpress.org/?v=<?php bloginfo_rss( 'version' ); ?></generator>
+ <language><?php echo get_option( 'rss_language' ); ?></language>
</ins><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><del>- <wp:base_blog_url><?php bloginfo_rss('url'); ?></wp:base_blog_url>
-<?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; ?>
- <?php do_action('rss2_head'); ?>
- <?php if ($post_ids) {
- global $wp_query;
- $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) ) {
- $where = "WHERE ID IN (".join(',', $next_posts).")";
- $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC");
- foreach ($posts as $post) {
- setup_postdata($post);
</del><ins>+ <wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
+ <?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; ?>
+
+ <?php do_action( 'rss2_head' ); ?>
</ins><span class="cx">
</span><del>- $is_sticky = 0;
- if ( is_sticky( $post->ID ) )
- $is_sticky = 1;
</del><ins>+ <?php if ( $post_ids ) {
+ global $wp_query;
+ $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 ) ) {
+ $where = "WHERE ID IN (" . join( ',', $next_posts ) . ")";
+ $posts = $wpdb->get_results( "SELECT * FROM $wpdb->posts $where ORDER BY post_date_gmt ASC" );
+
+ // Begin Loop
+ foreach ($posts as $post) {
+ setup_postdata( $post );
</ins><span class="cx">
</span><del>-?>
-<item>
-<title><?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()); ?></dc:creator>
-<?php wxr_post_taxonomy() ?>
</del><ins>+ $is_sticky = 0;
+ if ( is_sticky( $post->ID ) )
+ $is_sticky = 1;
</ins><span class="cx">
</span><del>-<guid isPermaLink="false"><?php the_guid(); ?></guid>
-<description></description>
-<content:encoded><?php echo wxr_cdata( apply_filters('the_content_export', $post->post_content) ); ?></content:encoded>
-<excerpt:encoded><?php echo wxr_cdata( apply_filters('the_excerpt_export', $post->post_excerpt) ); ?></excerpt: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>
-<wp:ping_status><?php echo $post->ping_status; ?></wp:ping_status>
-<wp:post_name><?php echo $post->post_name; ?></wp:post_name>
-<wp:status><?php echo $post->post_status; ?></wp:status>
-<wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>
-<wp:menu_order><?php echo $post->menu_order; ?></wp:menu_order>
-<wp:post_type><?php echo $post->post_type; ?></wp:post_type>
-<wp:post_password><?php echo $post->post_password; ?></wp:post_password>
-<wp:is_sticky><?php echo $is_sticky; ?></wp:is_sticky>
-<?php
-if ($post->post_type == 'attachment') { ?>
-<wp:attachment_url><?php echo wp_get_attachment_url($post->ID); ?></wp:attachment_url>
-<?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 ) { ?>
-<wp:postmeta>
-<wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
-<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
-</wp:postmeta>
-<?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 ) { ?>
-<wp:comment>
-<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>
-</wp:comment>
-<?php } } ?>
</del><ins>+ ?>
+ <item>
+ <title><?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() ); ?></dc:creator>
+ <?php wxr_post_taxonomy() ?>
+
+ <guid isPermaLink="false"><?php the_guid(); ?></guid>
+ <description></description>
+ <content:encoded><?php echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) ); ?></content:encoded>
+ <excerpt:encoded><?php echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) ); ?></excerpt: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>
+ <wp:ping_status><?php echo $post->ping_status; ?></wp:ping_status>
+ <wp:post_name><?php echo $post->post_name; ?></wp:post_name>
+ <wp:status><?php echo $post->post_status; ?></wp:status>
+ <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>
+ <wp:menu_order><?php echo $post->menu_order; ?></wp:menu_order>
+ <wp:post_type><?php echo $post->post_type; ?></wp:post_type>
+ <wp:post_password><?php echo $post->post_password; ?></wp:post_password>
+ <wp:is_sticky><?php echo $is_sticky; ?></wp:is_sticky>
+ <?php
+ if ( $post->post_type == 'attachment' ) { ?>
+ <wp:attachment_url><?php echo wp_get_attachment_url( $post->ID ); ?></wp:attachment_url>
+ <?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 ) { ?>
+ <wp:postmeta>
+ <wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
+ <wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
+ </wp:postmeta>
+ <?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 ) { ?>
+ <wp:comment>
+ <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>
+ </wp:comment>
+ <?php } } ?>
</ins><span class="cx"> </item>
</span><del>-<?php } } } ?>
</del><ins>+ <?php
+ }
+ }
+} ?>
</ins><span class="cx"> </channel>
</span><span class="cx"> </rss>
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>