Ticket #7563: html_entity_decode.patch

wp-admin/import/blogger.php

@@ -437 +437 @@
                                 if ( count( $matches[1] ) )
                                         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 ) {
                                         parse_str($query, $q);
@@ -495 +495 @@
                                 if ( count( $matches[1] ) )
                                         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);
 
@@ -545 +545 @@
                 }
 
                 $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';
 
@@ -600 +600 @@
                 $comment_author  = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
                 $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
                 $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content);

wp-admin/includes/dashboard.php

@@ -731 +731 @@
                         $title = $item['title'];
                 $title = wp_specialchars( $title );
 
-                $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES)) );
+                $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES, get_option('blog_charset'))) );
 
                 list($link, $frag) = explode( '#', $item['link'] );
 

wp-includes/feed.php

@@ -340 +340 @@
                 elseif ( 'atom' == $type )
                         $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";
         }
 
         return apply_filters('the_category_rss', $the_list, $type);

wp-includes/widgets.php

@@ -1508 +1508 @@
         $link = clean_url(strip_tags($rss->channel['link']));
         while ( strstr($link, 'http') != $link )
                 $link = substr($link, 1);
-        $desc = attribute_escape(strip_tags(html_entity_decode($rss->channel['description'], ENT_QUOTES)));
+        $desc = attribute_escape(strip_tags(html_entity_decode($rss->channel['description'], ENT_QUOTES, get_option('blog_charset'))));
         $title = $options[$number]['title'];
         if ( empty($title) )
                 $title = htmlentities(strip_tags($rss->channel['title']));
@@ -1577 +1577 @@
                                 $title = __('Untitled');
                         $desc = '';
                         if ( isset( $item['description'] ) && is_string( $item['description'] ) )
-                                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
+                                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES, get_option('blog_charset')))));
                         elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
-                                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
+                                $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES, get_option('blog_charset')))));
                         if ( 360 < strlen( $desc ) )
                                 $desc = wp_html_excerpt( $desc, 360 ) . ' [&hellip;]';
                         $summary = $desc;