WordPress.org

Make WordPress Core

Changeset 5822


Ignore:
Timestamp:
07/30/07 16:08:30 (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/wp-admin/export.php

    r5674 r5822  
    204204<wp:comment> 
    205205<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id> 
    206 <wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author> 
     206<wp:comment_author><?php echo wxr_cdata($c->comment_author); ?></wp:comment_author> 
    207207<wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email> 
    208208<wp:comment_author_url><?php echo $c->comment_author_url; ?></wp:comment_author_url> 
  • branches/2.2/wp-admin/import/wordpress.php

    r5426 r5822  
    3838        global $wpdb; 
    3939        preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return); 
    40         $return = $wpdb->escape( trim( $return[1] ) ); 
     40        $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]); 
     41        $return = $wpdb->escape( trim( $return ) ); 
    4142        return $return; 
    4243    } 
     
    216217 
    217218        while ( $c = array_shift($this->categories) ) { 
    218             $cat_name = trim(str_replace(array ('<![CDATA[', ']]>'), '', $this->get_tag( $c, 'wp:cat_name' ))); 
     219            $cat_name = trim($this->get_tag( $c, 'wp:cat_name' )); 
    219220 
    220221            // If the category exists we leave it alone 
     
    275276 
    276277        $post_content = $this->get_tag( $post, 'content:encoded' ); 
    277         $post_content = str_replace(array ('<![CDATA[', ']]>'), '', $post_content); 
    278278        $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); 
    279279        $post_content = str_replace('<br>', '<br />', $post_content); 
Note: See TracChangeset for help on using the changeset viewer.