Changeset 10688 for trunk/wp-admin/import/blogger.php

Timestamp:

03/03/2009 06:37:25 PM (16 years ago)

Author:

ryan

Message:

Pass blog charset to html_entity_decode(). Props adferguson. fixes #7563

File:

• trunk/wp-admin/import/blogger.php (modified) (4 diffs)

trunk/wp-admin/import/blogger.php

@@ -438 +438 @@
                     foreach ( $matches[1] as $match )
                         if ( preg_match('/rel=.previous./', $match) )
-                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
 
                 if ( $query ) {
@@ -496 +496 @@
                     foreach ( $matches[1] as $match )
                         if ( preg_match('/rel=.previous./', $match) )
-                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) );
+                            $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') );
 
                 parse_str($query, $q);
@@ -546 +546 @@
 
         $post_date    = $this->convert_date( $entry->published );
-        $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) );
+        $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) );
         $post_title   = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) );
         $post_status  = isset( $entry->draft ) ? 'draft' : 'publish';
@@ -601 +601 @@
         $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
         $comment_date    = $this->convert_date( $entry->updated );
-        $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) );
+        $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) );
 
         // Clean up content