Changeset 5711 for trunk/wp-admin/import/wordpress.php

Timestamp:

06/15/2007 05:22:38 PM (19 years ago)

Author:

ryan

Message:

Use CDATA escaping on fields. Props tellyworth. fixes #4452

File:

• trunk/wp-admin/import/wordpress.php (modified) (3 diffs)

trunk/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\[(.*)\]\]>|', '$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);