Changeset 10688

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/import/blogger.php (modified) (4 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (2 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

trunk/wp-admin/includes/dashboard.php

@@ -748 +748 @@
                 $title = wp_specialchars( $title );
 
-                $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES)) );
+                $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
 
                 list($link, $frag) = explode( '#', $item->get_link() );

trunk/wp-includes/feed.php

@@ -341 +341 @@
                         $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) );
                 else
-                        $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name ) . "]]></category>\n";
+                        $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
         }
 

trunk/wp-includes/widgets.php

@@ -1506 +1506 @@
         while ( strstr($link, 'http') != $link )
                 $link = substr($link, 1);
-        $desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES)));
+        $desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
         $title = $options[$number]['title'];
         if ( empty($title) )
@@ -1576 +1576 @@
                         $title = __('Untitled');
 
-                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES))));
+                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
                 $desc = wp_html_excerpt( $desc, 360 ) . ' […]';
                 $desc = wp_specialchars( $desc );