WordPress 3.7.2

[autoinstalls/wordpress.git] / wp-admin / includes / export.php

diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index e9c909d621ea3bfa836292a0c3b3e3fb4f2786a8..91d88a18abe5b9f8ff330319f75558e12b653c22 100644 (file)
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -238,7 +238,7 @@ function export_wp( $args = array() ) {
                global $wpdb;
 
                $authors = array();
                global $wpdb;
 
                $authors = array();

-               $results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts" );
+               $results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft'" );

                foreach ( (array) $results as $result )
                        $authors[] = get_userdata( $result->post_author );
 
                foreach ( (array) $results as $result )
                        $authors[] = get_userdata( $result->post_author );
 


@@ -279,7 +279,7 @@ function export_wp( $args = array() ) {
         * @since 2.3.0
         */
        function wxr_post_taxonomy() {
         * @since 2.3.0
         */
        function wxr_post_taxonomy() {

-               global $post;
+               $post = get_post();

 
                $taxonomies = get_object_taxonomies( $post->post_type );
                if ( empty( $taxonomies ) )
 
                $taxonomies = get_object_taxonomies( $post->post_type );
                if ( empty( $taxonomies ) )


@@ -367,11 +367,12 @@ function export_wp( $args = array() ) {
                $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
 ?>
        <item>
                $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
 ?>
        <item>

+               <?php /** This filter is documented in wp-includes/feed.php */ ?>

                <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>
                <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 get_the_author_meta( 'login' ); ?></dc:creator>
-               <guid isPermaLink="false"><?php esc_url( the_guid() ); ?></guid>
+               <dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
+               <guid isPermaLink="false"><?php the_guid(); ?></guid>

                <description></description>
                <content:encoded><?php 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>
                <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>