Changeset 5822

Timestamp:

07/30/2007 04:08:30 PM (17 years ago)

Author:

markjaquith

Message:

Use CDATA escaping/unescaping for comment_author. props tellyworth. fixes #4452 for 2.2.x

Location:

branches/2.2/wp-admin

Files:

• export.php (modified) (1 diff)
• import/wordpress.php (modified) (3 diffs)

branches/2.2/wp-admin/export.php

@@ -204 +204 @@
 <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>

branches/2.2/wp-admin/import/wordpress.php

@@ -38 +38 @@
         global $wpdb;
         preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-        $return = $wpdb->escape( trim( $return[1] ) );
+        $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
+        $return = $wpdb->escape( trim( $return ) );
         return $return;
     }
@@ -216 +217 @@
 
         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
@@ -275 +276 @@
 
         $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);