X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..a349837896628462bf8c9bdc27d1477a10fe03eb:/wp-admin/includes/export.php
diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index 6aa85a85..a7f20991 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -13,7 +13,7 @@
*
* @since 2.5.0
*/
-define( 'WXR_VERSION', '1.1' );
+define( 'WXR_VERSION', '1.2' );
/**
* Generates the WXR export file for download
@@ -30,7 +30,7 @@ function export_wp( $args = array() ) {
);
$args = wp_parse_args( $args, $defaults );
- do_action( 'export_wp' );
+ do_action( 'export_wp', $args );
$sitename = sanitize_key( get_bloginfo( 'name' ) );
if ( ! empty($sitename) ) $sitename .= '.';
@@ -117,13 +117,14 @@ function export_wp( $args = array() ) {
* @since 2.1.0
*
* @param string $str String to wrap in XML CDATA tag.
+ * @return string
*/
function wxr_cdata( $str ) {
if ( seems_utf8( $str ) == false )
$str = utf8_encode( $str );
// $str = ent2ncr(esc_html($str));
- $str = "';
+ $str = '', ']]]]>', $str ) . ']]>';
return $str;
}
@@ -237,7 +238,7 @@ function export_wp( $args = 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 );
@@ -278,7 +279,7 @@ function export_wp( $args = array() ) {
* @since 2.3.0
*/
function wxr_post_taxonomy() {
- global $post;
+ $post = get_post();
$taxonomies = get_object_taxonomies( $post->post_type );
if ( empty( $taxonomies ) )
@@ -331,7 +332,7 @@ function export_wp( $args = array() ) {
-
+
@@ -366,11 +367,12 @@ function export_wp( $args = array() ) {
$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
?>
-
+
post_title ); ?>
-
-
+
+
post_content ) ); ?>
post_excerpt ) ); ?>