Ticket #4452: import-cdata-r5694.patch

wp-admin/import/wordpress.php

@@ -37 +37 @@
         function get_tag( $string, $tag ) {
                 global $wpdb;
                 preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-                $return = $wpdb->escape( trim( $return[1] ) );
+                $return = preg_replace('|<!\[CDATA\[(.*)\]\]>|', '$1', $return[1]);
+                $return = $wpdb->escape( trim( $return ) );
                 return $return;
         }
 
@@ -215 +216 @@
                 $cat_names = (array) $wpdb->get_col("SELECT cat_name FROM $wpdb->categories");
 
                 while ( $c = array_shift($this->categories) ) {
-                        $cat_name = trim(str_replace(array ('<![CDATA[', ']]>'), '', $this->get_tag( $c, 'wp:cat_name' )));
+                        $cat_name = trim($this->get_tag( $c, 'wp:cat_name' ));
 
                         // If the category exists we leave it alone
                         if ( in_array($cat_name, $cat_names) )
@@ -274 +275 @@
                 $post_author    = $this->get_tag( $post, 'dc:creator' );
 
                 $post_content = $this->get_tag( $post, 'content:encoded' );
-                $post_content = str_replace(array ('<![CDATA[', ']]>'), '', $post_content);
                 $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content);
                 $post_content = str_replace('<br>', '<br />', $post_content);
                 $post_content = str_replace('<hr>', '<hr />', $post_content);

wp-admin/export.php

@@ -131 +131 @@
         This is a WordPress eXtended RSS file generated by WordPress as an export of 
         your blog. It contains information about your blog's posts, comments, and 
         categories. You may use this file to transfer that content from one site to 
-        another. This file is not intended to serve as a complete backup of your 
+        another. This file is not intended to serve as a complete backup of your
         blog.
         
         To import this information into a WordPress blog follow these steps:
@@ -203 +203 @@
 if ( $comments ) { foreach ( $comments as $c ) { ?>
 <wp:comment>
 <wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>
-<wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author>
+<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 $c->comment_author_url; ?></wp:comment_author_url>
 <wp:comment_author_IP><?php echo $c->comment_author_IP; ?></wp:comment_author_IP>