Changes from trunk/wp-admin/includes/export.php at r17989 to branches/3.1/wp-admin/includes/export.php at r17416

File:

• branches/3.1/wp-admin/includes/export.php (modified) (5 diffs)

branches/3.1/wp-admin/includes/export.php

@@ -50 +50 @@
         $post_types = get_post_types( array( 'can_export' => true ) );
         $esses = array_fill( 0, count($post_types), '%s' );
-        $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
+        $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (". implode(',',$esses) .")", $post_types );
     }
 
@@ -124 +124 @@
 
         // $str = ent2ncr(esc_html($str));
-        $str = "<![CDATA[$str" . ( ( substr( $str, -1 ) == ']' ) ? ' ' : '' ) . ']]>';
+        $str = "<![CDATA[$str" . ( ( substr( $str, -1 ) == ']' ) ? ' ' : '') . "]]>";
 
         return $str;
@@ -351 +351 @@
     // 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 ) . ')';
+    $where = "WHERE ID IN (" . join( ',', $next_posts ) . ")";
     $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
 
@@ -385 +385 @@
 <?php   wxr_post_taxonomy(); ?>
 <?php   $postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
-        foreach( $postmeta as $meta ) : if ( $meta->meta_key != '_edit_lock' ) : ?>
+        if ( $postmeta ) : foreach( $postmeta as $meta ) : if ( $meta->meta_key != '_edit_lock' ) : ?>
         <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   endif; endforeach; ?>
+<?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 ) );
-        foreach ( $comments as $c ) : ?>
+        if ( $comments ) : foreach ( $comments as $c ) : ?>
         <wp:comment>
             <wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>
@@ -406 +406 @@
             <wp:comment_parent><?php echo $c->comment_parent; ?></wp:comment_parent>
             <wp:comment_user_id><?php echo $c->user_id; ?></wp:comment_user_id>
-<?php       $c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-            foreach ( $c_meta as $meta ) : ?>
-            <wp:commentmeta>
-                <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:commentmeta>
-<?php       endforeach; ?>
         </wp:comment>
-<?php   endforeach; ?>
+<?php   endforeach; endif; ?>
     </item>
 <?php