Ticket #4376: 4376.diff

wp-admin/export.php

@@ -193 +193 @@
                         $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); ?>
+                                        setup_postdata($post); 
+                                        
+                                        // Strip Protected or Private prefixes from the title.
+                                        $post_title = get_the_title_rss();
+                                        if ( !empty($post->post_password) )
+                                                $post_title = str_replace( sprintf(__('Protected: %s'), ''), '', $post_title);
+                                        else if ( 'private' == $post->post_status )
+                                                $post_title = str_replace( sprintf(__('Private: %s'), ''), '', $post_title);
+                                        ?>
 <item>
-<title><?php the_title_rss() ?></title>
+<title><?php echo $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 the_author() ?></dc:creator>
@@ -214 +222 @@
 <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>
 <?php
 $postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");
 if ( $postmeta ) {

wp-admin/import/wordpress.php

@@ -278 +278 @@
                 $post_parent    = $this->get_tag( $post, 'wp:post_parent' );
                 $menu_order     = $this->get_tag( $post, 'wp:menu_order' );
                 $post_type      = $this->get_tag( $post, 'wp:post_type' );
+                $post_password  = $this->get_tag( $post, 'wp:post_password' );
                 $guid           = $this->get_tag( $post, 'guid' );
                 $post_author    = $this->get_tag( $post, 'dc:creator' );
 
@@ -312 +313 @@
 
                         $post_author = $this->checkauthor($post_author); //just so that if a post already exists, new users are not created by checkauthor
 
-                        $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'post_name', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'menu_order', 'post_type');
+                        $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'post_name', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt', 'guid', 'post_parent', 'menu_order', 'post_type', 'post_password');
                         $comment_post_ID = $post_id = wp_insert_post($postdata);
 
                         // Memorize old and new ID.